diff --git a/.github/workflows/semantic-pr.yaml b/.github/workflows/semantic-pr.yaml
index 3b1609cee..c7392ef0f 100644
--- a/.github/workflows/semantic-pr.yaml
+++ b/.github/workflows/semantic-pr.yaml
@@ -14,6 +14,6 @@ jobs:
   semantic-message:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@e32d7e603df1aa1ba07e981f2a23455dee596825 # v5
+      - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index e1a244283..f7014c353 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.10.1"
+  ".": "0.11.0"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f0075637..2c914cdbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [0.11.0](https://github.com/glasskube/glasskube/compare/v0.10.1...v0.11.0) (2024-06-27)
+
+
+### Features
+
+* **cli:** add ascii art on glasskube version ([#879](https://github.com/glasskube/glasskube/issues/879)) ([3040ab1](https://github.com/glasskube/glasskube/commit/3040ab10f156a551c1bcbbaa06c79e819460dad3))
+
+
+### Bug Fixes
+
+* **cli:** standardize usage texts ([#848](https://github.com/glasskube/glasskube/issues/848)) ([7d23c1e](https://github.com/glasskube/glasskube/commit/7d23c1e638c406e827a25388a56efd0707eeecac))
+* **deps:** update module github.com/yuin/goldmark to v1.7.4 ([#868](https://github.com/glasskube/glasskube/issues/868)) ([d7ce5fa](https://github.com/glasskube/glasskube/commit/d7ce5fa72434e93720a9681279e8ad3e5e058cfe))
+* **open:** fix typo in service name candidate ([#885](https://github.com/glasskube/glasskube/issues/885)) ([921d049](https://github.com/glasskube/glasskube/commit/921d049ff4f3575ee863a1f2ed3f5b78ea94bf47))
+
+
+### Other
+
+* **website:** configure eslint with docusaurus, react-ts and prettier plugins ([#858](https://github.com/glasskube/glasskube/issues/858)) ([613cbb7](https://github.com/glasskube/glasskube/commit/613cbb728da7cd1329b75b3148b17c2cb01ea50b))
+
+
+### Docs
+
+* exchange static image with gif ([#862](https://github.com/glasskube/glasskube/issues/862)) ([946baf4](https://github.com/glasskube/glasskube/commit/946baf46f4872ed2b45188dfb378ed0f2df6cb24))
+* **website:** exchange repo mockup with actual screenshots ([#852](https://github.com/glasskube/glasskube/issues/852)) ([8adf8fb](https://github.com/glasskube/glasskube/commit/8adf8fb8e20f29e635eb9ce812338dd068f297bb))
+* **website:** fix broken link ([#886](https://github.com/glasskube/glasskube/issues/886)) ([146dc25](https://github.com/glasskube/glasskube/commit/146dc25b11771cb81aa782fa9ec4895bccdd4a07))
+* **website:** fix typo ([#878](https://github.com/glasskube/glasskube/issues/878)) ([e6ebb8c](https://github.com/glasskube/glasskube/commit/e6ebb8c16b3f41976e41b86ed5d4d130ed80fa32))
+* **website:** glasskube is backed by Y Combinator ([#853](https://github.com/glasskube/glasskube/issues/853)) ([05e2ef7](https://github.com/glasskube/glasskube/commit/05e2ef7ce37af1ee31618dbb49258ab45d3a8a37))
+
 ## [0.10.1](https://github.com/glasskube/glasskube/compare/v0.10.0...v0.10.1) (2024-06-24)
 
 
diff --git a/api/v1alpha1/package_manifest.go b/api/v1alpha1/package_manifest.go
index c26a1e077..2360674bd 100644
--- a/api/v1alpha1/package_manifest.go
+++ b/api/v1alpha1/package_manifest.go
@@ -85,6 +85,14 @@ func (PackageScope) JSONSchema() *jsonschema.Schema {
 	}
 }
 
+func (s *PackageScope) IsCluster() bool {
+	return s == nil || *s == ScopeCluster
+}
+
+func (s *PackageScope) IsNamespaced() bool {
+	return s != nil && *s == ScopeNamespaced
+}
+
 type PackageManifest struct {
 	// Scope is optional (default is Cluster)
 	Scope            *PackageScope      `json:"scope,omitempty"`
diff --git a/cmd/glasskube/cmd/auto-update.go b/cmd/glasskube/cmd/auto-update.go
index f72451d2f..c2b0c7bb0 100644
--- a/cmd/glasskube/cmd/auto-update.go
+++ b/cmd/glasskube/cmd/auto-update.go
@@ -8,17 +8,24 @@ import (
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/internal/config"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	"github.com/glasskube/glasskube/pkg/statuswriter"
 	"github.com/glasskube/glasskube/pkg/update"
 	"github.com/spf13/cobra"
 	"go.uber.org/multierr"
 )
 
-var autoUpdateEnabledDisabledOptions = struct{ Yes, All bool }{}
+var autoUpdateEnabledDisabledOptions = struct {
+	Yes, All bool
+	KindOptions
+	NamespaceOptions
+}{
+	KindOptions: DefaultKindOptions(),
+}
 
 var autoUpdateEnableCmd = &cobra.Command{
 	Use:               "enable [...package]",
-	Short:             "Enable automatic updates for packages",
+	Short:             "Enable automatic updates for packages:",
 	PreRun:            cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
 	ValidArgsFunction: completeInstalledPackageNames,
 	Run: runAutoUpdateEnableOrDisable(true,
@@ -27,8 +34,8 @@ var autoUpdateEnableCmd = &cobra.Command{
 
 var autoUpdateDisableCmd = &cobra.Command{
 	Use:               "disable [...package]",
-	Short:             "Disable automatic updates for packages",
-	PreRun:            cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
+	Short:             "Disable automatic updates for packages:",
+	PreRun:            cliutils.SetupClientContext(false, &rootCmdOptions.SkipUpdateCheck),
 	ValidArgsFunction: completeInstalledPackageNames,
 	Run: runAutoUpdateEnableOrDisable(false,
 		"Enable automatic updates for the following packages", "Automatic updates disabled"),
@@ -38,30 +45,47 @@ func runAutoUpdateEnableOrDisable(enabled bool, confirmMsg, successMsg string) f
 	return func(cmd *cobra.Command, args []string) {
 		ctx := cmd.Context()
 		client := cliutils.PackageClient(ctx)
-		var pkgs []v1alpha1.ClusterPackage
+		var pkgs []ctrlpkg.Package
 		if autoUpdateEnabledDisabledOptions.All {
 			if len(args) > 0 {
 				fmt.Fprintf(os.Stderr, "Too many arguments: %v\n", args)
 				cliutils.ExitWithError()
 			}
-			var pkgList v1alpha1.ClusterPackageList
-			if err := client.ClusterPackages().GetAll(ctx, &pkgList); err != nil {
-				fmt.Fprintf(os.Stderr, "Could not list packages: %v", err)
-				cliutils.ExitWithError()
+			if autoUpdateEnabledDisabledOptions.Kind != KindPackage && autoUpdateEnabledDisabledOptions.Namespace == "" {
+				var pkgList v1alpha1.ClusterPackageList
+				if err := client.ClusterPackages().GetAll(ctx, &pkgList); err != nil {
+					fmt.Fprintf(os.Stderr, "Could not list packages: %v", err)
+					cliutils.ExitWithError()
+				}
+				for i := range pkgList.Items {
+					pkgs = append(pkgs, &pkgList.Items[i])
+				}
+			}
+			if autoUpdateEnabledDisabledOptions.Kind != KindClusterPackage {
+				var pkgList v1alpha1.PackageList
+				if err := client.Packages(autoUpdateEnabledDisabledOptions.Namespace).
+					GetAll(ctx, &pkgList); err != nil {
+					fmt.Fprintf(os.Stderr, "Could not list packages: %v", err)
+					cliutils.ExitWithError()
+				}
+				for i := range pkgList.Items {
+					pkgs = append(pkgs, &pkgList.Items[i])
+				}
 			}
-			pkgs = pkgList.Items
 			for _, pkg := range pkgs {
-				args = append(args, pkg.Name)
+				args = append(args, pkg.GetName())
 			}
 		} else {
 			if len(args) == 0 {
 				fmt.Fprintln(os.Stderr, "Please specify at least one package")
 				cliutils.ExitWithError()
 			}
-			pkgs = make([]v1alpha1.ClusterPackage, len(args))
+			pkgs = make([]ctrlpkg.Package, len(args))
 			for i, name := range args {
-				var pkg v1alpha1.ClusterPackage
-				if err := client.ClusterPackages().Get(ctx, name, &pkg); err != nil {
+				pkg, err := getPackageOrClusterPackage(ctx, name,
+					autoUpdateEnabledDisabledOptions.KindOptions,
+					autoUpdateEnabledDisabledOptions.NamespaceOptions)
+				if err != nil {
 					fmt.Fprintf(os.Stderr, "Could not get package %v: %v", name, err)
 					cliutils.ExitWithError()
 				}
@@ -69,7 +93,20 @@ func runAutoUpdateEnableOrDisable(enabled bool, confirmMsg, successMsg string) f
 			}
 		}
 
-		fmt.Fprintf(os.Stderr, "%v: %v\n", confirmMsg, strings.Join(args, ", "))
+		if len(pkgs) == 0 {
+			fmt.Fprintln(os.Stderr, "Nothing to do")
+			cliutils.ExitSuccess()
+		}
+
+		fmt.Fprintln(os.Stderr, confirmMsg)
+		for _, pkg := range pkgs {
+			if pkg.IsNamespaceScoped() {
+				fmt.Fprintf(os.Stderr, " * %v (Package in namespace %v with type %v)\n",
+					pkg.GetName(), pkg.GetNamespace(), pkg.GetSpec().PackageInfo.Name)
+			} else {
+				fmt.Fprintf(os.Stderr, " * %v (ClusterPackage)\n", pkg.GetName())
+			}
+		}
 		if !autoUpdateEnabledDisabledOptions.Yes && !cliutils.YesNoPrompt("Continue?", true) {
 			cancel()
 		}
@@ -78,7 +115,14 @@ func runAutoUpdateEnableOrDisable(enabled bool, confirmMsg, successMsg string) f
 		for _, pkg := range pkgs {
 			if pkg.AutoUpdatesEnabled() != enabled {
 				pkg.SetAutoUpdatesEnabled(enabled)
-				multierr.AppendInto(&err, client.ClusterPackages().Update(ctx, &pkg))
+				switch pkg := pkg.(type) {
+				case *v1alpha1.ClusterPackage:
+					multierr.AppendInto(&err, client.ClusterPackages().Update(ctx, pkg))
+				case *v1alpha1.Package:
+					multierr.AppendInto(&err, client.Packages(pkg.Namespace).Update(ctx, pkg))
+				default:
+					panic("unexpected type")
+				}
 			}
 		}
 		if err != nil {
@@ -107,36 +151,49 @@ func runAutoUpdate(cmd *cobra.Command, args []string) {
 	updater := update.NewUpdater(ctx).
 		WithStatusWriter(statuswriter.Stderr())
 
-	var pkgs v1alpha1.ClusterPackageList
-	if err := client.ClusterPackages().GetAll(ctx, &pkgs); err != nil {
+	var pkgs []ctrlpkg.Package
+
+	var cpkgList v1alpha1.ClusterPackageList
+	if err := client.ClusterPackages().GetAll(ctx, &cpkgList); err != nil {
+		panic(err)
+	}
+
+	for i, pkg := range cpkgList.Items {
+		if pkg.AutoUpdatesEnabled() {
+			pkgs = append(pkgs, &cpkgList.Items[i])
+		}
+	}
+
+	var pkgList v1alpha1.PackageList
+	if err := client.Packages("").GetAll(ctx, &pkgList); err != nil {
 		panic(err)
 	}
 
-	var packageNames []string
-	for _, pkg := range pkgs.Items {
+	for i, pkg := range pkgList.Items {
 		if pkg.AutoUpdatesEnabled() {
-			packageNames = append(packageNames, pkg.Name)
+			pkgs = append(pkgs, &pkgList.Items[i])
 		}
 	}
-	if len(packageNames) == 0 {
+
+	if len(pkgs) == 0 {
 		fmt.Fprintln(os.Stderr, "Automatic updates must be enabled for at least one package")
 		cliutils.ExitSuccess()
 	}
 
-	tx, err := updater.Prepare(ctx, packageNames)
+	tx, err := updater.Prepare(ctx, update.GetExact(pkgs))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error preparing update: %v\n", err)
 		cliutils.ExitWithError()
 	}
 	printTransaction(*tx)
 
-	if updated, err := updater.Apply(ctx, tx); err != nil {
+	if updated, err := updater.ApplyBlocking(ctx, tx); err != nil {
 		fmt.Fprintf(os.Stderr, "Error applying update: %v\n", err)
 		cliutils.ExitWithError()
 	} else {
 		updatedNames := make([]string, len(updated))
 		for i := range updated {
-			updatedNames[i] = updated[i].Name
+			updatedNames[i] = updated[i].GetName()
 		}
 		fmt.Fprintf(os.Stderr, "Updated packages: %v\n", strings.Join(updatedNames, ", "))
 	}
@@ -150,6 +207,8 @@ func init() {
 			autoUpdateEnabledDisabledOptions.Yes, "do not ask for confirmation")
 		cmd.Flags().BoolVar(&autoUpdateEnabledDisabledOptions.All, "all",
 			autoUpdateEnabledDisabledOptions.All, "set for all packages")
+		autoUpdateEnabledDisabledOptions.KindOptions.AddFlagsToCommand(cmd)
+		autoUpdateEnabledDisabledOptions.NamespaceOptions.AddFlagsToCommand(cmd)
 		autoUpdateCmd.AddCommand(cmd)
 	}
 	RootCmd.AddCommand(autoUpdateCmd)
diff --git a/cmd/glasskube/cmd/bootstrap.go b/cmd/glasskube/cmd/bootstrap.go
index e6866796a..14aa408a1 100644
--- a/cmd/glasskube/cmd/bootstrap.go
+++ b/cmd/glasskube/cmd/bootstrap.go
@@ -29,6 +29,7 @@ type bootstrapOptions struct {
 	force                   bool
 	createDefaultRepository bool
 	yes                     bool
+	dryRun                  bool
 	OutputOptions
 }
 
@@ -76,6 +77,12 @@ var bootstrapCmd = &cobra.Command{
 			}
 		}
 
+		if bootstrapCmdOptions.dryRun {
+			fmt.Fprintln(os.Stderr,
+				"🔎 Dry-run mode is enabled. "+
+					"Nothing will be changed in your cluster, but validations will still be run.")
+		}
+
 		verifyLegalUpdate(ctx, installedVersion, targetVersion)
 
 		manifests, err := client.Bootstrap(ctx, bootstrapCmdOptions.asBootstrapOptions())
@@ -83,7 +90,7 @@ var bootstrapCmd = &cobra.Command{
 			fmt.Fprintf(os.Stderr, "\nAn error occurred during bootstrap:\n%v\n", err)
 			cliutils.ExitWithError()
 		}
-		if err := printBootsrap(
+		if err := printBootstrap(
 			manifests,
 			bootstrapCmdOptions.Output,
 		); err != nil {
@@ -101,10 +108,11 @@ func (o bootstrapOptions) asBootstrapOptions() bootstrap.BootstrapOptions {
 		DisableTelemetry:        o.disableTelemetry,
 		Force:                   o.force,
 		CreateDefaultRepository: o.createDefaultRepository,
+		DryRun:                  o.dryRun,
 	}
 }
 
-func printBootsrap(manifests []unstructured.Unstructured, output OutputFormat) error {
+func printBootstrap(manifests []unstructured.Unstructured, output OutputFormat) error {
 	if output != "" {
 		if err := convertAndPrintManifests(manifests, output); err != nil {
 			return err
@@ -221,6 +229,8 @@ func init() {
 	bootstrapCmd.Flags().BoolVar(&bootstrapCmdOptions.createDefaultRepository, "create-default-repository",
 		bootstrapCmdOptions.createDefaultRepository,
 		"Toggle creation of the default glasskube package repository")
+	bootstrapCmd.PersistentFlags().BoolVar(&bootstrapCmdOptions.dryRun, "dry-run", false,
+		"Do not make any changes but run all validations")
 	bootstrapCmd.Flags().BoolVar(&bootstrapCmdOptions.yes, "yes", false, "Skip confirmation prompt")
 	bootstrapCmd.MarkFlagsMutuallyExclusive("url", "type")
 	bootstrapCmd.MarkFlagsMutuallyExclusive("url", "latest")
diff --git a/cmd/glasskube/cmd/configure.go b/cmd/glasskube/cmd/configure.go
index 35fd16994..9b15b7a4f 100644
--- a/cmd/glasskube/cmd/configure.go
+++ b/cmd/glasskube/cmd/configure.go
@@ -27,7 +27,7 @@ var configureCmdOptions = struct {
 }
 
 var configureCmd = &cobra.Command{
-	Use:               "configure [package-name]",
+	Use:               "configure <package-name>",
 	Short:             "Configure a package",
 	Args:              cobra.ExactArgs(1),
 	PreRun:            cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
@@ -132,8 +132,7 @@ func runConfigure(cmd *cobra.Command, args []string) {
 func init() {
 	configureCmdOptions.ValuesOptions.AddFlagsToCommand(configureCmd)
 	configureCmdOptions.OutputOptions.AddFlagsToCommand(configureCmd)
-	// TODO: Enable these flags to support namespaced packages
-	// configureCmdOptions.NamespaceOptions.AddFlagsToCommand(configureCmd)
-	// configureCmdOptions.KindOptions.AddFlagsToCommand(configureCmd)
+	configureCmdOptions.NamespaceOptions.AddFlagsToCommand(configureCmd)
+	configureCmdOptions.KindOptions.AddFlagsToCommand(configureCmd)
 	RootCmd.AddCommand(configureCmd)
 }
diff --git a/cmd/glasskube/cmd/describe.go b/cmd/glasskube/cmd/describe.go
index 803d6df7d..0719ae150 100644
--- a/cmd/glasskube/cmd/describe.go
+++ b/cmd/glasskube/cmd/describe.go
@@ -13,6 +13,7 @@ import (
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/clientutils"
 	"github.com/glasskube/glasskube/internal/cliutils"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	"github.com/glasskube/glasskube/internal/manifestvalues"
 	repoclient "github.com/glasskube/glasskube/internal/repo/client"
 	"github.com/glasskube/glasskube/internal/semver"
@@ -23,17 +24,21 @@ import (
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/renderer"
 	"github.com/yuin/goldmark/util"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/yaml"
 )
 
 var describeCmdOptions = struct {
 	repository string
 	OutputOptions
-}{}
+	KindOptions
+	NamespaceOptions
+}{
+	KindOptions: DefaultKindOptions(),
+}
 
 var describeCmd = &cobra.Command{
-	Use:               "describe [package-name]",
+	Use:               "describe <package-name>",
 	Short:             "Describe a package",
 	Long:              "Shows additional information about the given package.",
 	Args:              cobra.ExactArgs(1),
@@ -44,41 +49,104 @@ var describeCmd = &cobra.Command{
 		pkgName := args[0]
 		repoClient := cliutils.RepositoryClientset(ctx)
 
-		latestManifest, latestVersion, err :=
+		latestManifest, latestVersion, lvErr :=
 			describe.DescribeLatestVersion(ctx, describeCmdOptions.repository, pkgName)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "❌ Could not get latest info for %v: %v\n", pkgName, err)
-			cliutils.ExitWithError()
+		pkg, pkgErr :=
+			getPackageOrClusterPackage(ctx, pkgName, describeCmdOptions.KindOptions, describeCmdOptions.NamespaceOptions)
+
+		var manifest *v1alpha1.PackageManifest
+		var err error
+
+		if pkgErr != nil {
+			if errors.IsNotFound(pkgErr) {
+				// package not installed -> use latest manifest from repo
+				if lvErr != nil {
+					fmt.Fprintf(os.Stderr, "❌ Could not get latest info for %v: %v\n", pkgName, lvErr)
+					cliutils.ExitWithError()
+				}
+
+				manifest = latestManifest
+
+				// set p to a nil pointer with a concrete type so IsNil works correctly
+				if manifest.Scope.IsCluster() {
+					var p *v1alpha1.ClusterPackage
+					pkg = p
+				} else {
+					var p *v1alpha1.Package
+					pkg = p
+				}
+			} else {
+				// Unhandled error -> exit
+				fmt.Fprintf(os.Stderr, "❌ Could not get resource: %v\n", pkgErr)
+				cliutils.ExitWithError()
+			}
+		} else {
+			if manifest, err = describe.GetManifestForPkg(ctx, pkg); err != nil {
+				fmt.Fprintf(os.Stderr, "❌ Could not describe package %v: %v\n", pkgName, err)
+				cliutils.ExitWithError()
+			}
+			_, latestVersion, lvErr = describe.DescribeLatestVersion(ctx,
+				pkg.GetSpec().PackageInfo.RepositoryName,
+				pkg.GetSpec().PackageInfo.Name)
+			if lvErr != nil {
+				fmt.Fprintf(os.Stderr, "❌ Could not get latest version: %v\n", err)
+				cliutils.ExitWithError()
+			}
 		}
 
-		repos, err := repoClient.Meta().GetReposForPackage(pkgName)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "❌ Could not get repos for %v: %v\n", pkgName, err)
-			cliutils.ExitWithError()
+		// if pkgName refers to a namespace-scoped manifest and not an installed package, show something about every instance
+		var pkgs []v1alpha1.Package
+		if pkg.IsNil() && manifest.Scope.IsNamespaced() {
+			client := cliutils.PackageClient(ctx)
+			var pkgList v1alpha1.PackageList
+			if err := client.Packages(describeCmdOptions.Namespace).GetAll(ctx, &pkgList); err != nil {
+				fmt.Fprintf(os.Stderr, "❌ Could not list packages for %v: %v\n", pkgName, err)
+				cliutils.ExitWithError()
+			}
+			for _, pkg := range pkgList.Items {
+				if pkg.Spec.PackageInfo.Name == pkgName &&
+					(describeCmdOptions.repository == "" ||
+						pkg.Spec.PackageInfo.RepositoryName == describeCmdOptions.repository) {
+
+					pkgs = append(pkgs, pkg)
+				}
+			}
 		}
 
-		pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName)
-		if err != nil && !apierrors.IsNotFound(err) {
-			// Unhandled error -> exit
-			fmt.Fprintf(os.Stderr, "❌ Could not describe package %v: %v\n", pkgName, err)
+		var repos []v1alpha1.PackageRepository
+		if pkg.IsNil() {
+			repos, err = repoClient.Meta().GetReposForPackage(pkgName)
+		} else {
+			repos, err = repoClient.Meta().GetReposForPackage(pkg.GetSpec().PackageInfo.Name)
+		}
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "❌ Could not get repos for %v: %v\n", pkgName, err)
 			cliutils.ExitWithError()
-		} else if err != nil {
-			// package not installed -> use latest manifest from repo
-			manifest = latestManifest
 		}
 
 		bold := color.New(color.Bold).SprintFunc()
 
 		if describeCmdOptions.Output == OutputFormatJSON {
-			printJSON(ctx, pkg, manifest, latestVersion, repos)
+			printJSON(ctx, pkg, pkgs, manifest, latestVersion, repos)
 		} else if describeCmdOptions.Output == OutputFormatYAML {
-			printYAML(ctx, pkg, manifest, latestVersion, repos)
+			printYAML(ctx, pkg, pkgs, manifest, latestVersion, repos)
 		} else {
 			fmt.Println(bold("Package:"), nameAndDescription(manifest))
-			fmt.Println(bold("Version:"), version(pkg, latestVersion))
-			fmt.Println(bold("Status: "), status(pkg))
-			if pkg != nil {
+
+			if !pkg.IsNil() {
+				fmt.Println(bold("Version:    "), version(pkg, latestVersion))
+				fmt.Println(bold("Status:     "), status(pkg))
 				fmt.Println(bold("Auto-Update:"), clientutils.AutoUpdateString(pkg, "Disabled"))
+			} else if len(pkgs) > 0 {
+				fmt.Println()
+				fmt.Println(bold("Instances:"))
+				for i, pkg := range pkgs {
+					fmt.Println(fmt.Sprintf(" %v.", i+1), bold("Name:       "), pkg.Name)
+					fmt.Println(bold("    Namespace:  "), pkg.Namespace)
+					fmt.Println(bold("    Version:    "), version(&pkg, latestVersion))
+					fmt.Println(bold("    Status:     "), status(&pkg))
+					fmt.Println(bold("    Auto-Update:"), clientutils.AutoUpdateString(&pkg, "Disabled"))
+				}
 			}
 
 			if len(manifest.Entrypoints) > 0 {
@@ -108,10 +176,10 @@ var describeCmd = &cobra.Command{
 				printMarkdown(os.Stdout, trimmedDescription)
 			}
 
-			if pkg != nil && len(pkg.Spec.Values) > 0 {
+			if !pkg.IsNil() && len(pkg.GetSpec().Values) > 0 {
 				fmt.Println()
 				fmt.Println(bold("Configuration:"))
-				printValueConfigurations(os.Stdout, pkg.Spec.Values)
+				printValueConfigurations(os.Stdout, pkg.GetSpec().Values)
 			}
 		}
 	},
@@ -154,7 +222,7 @@ func printDependencies(manifest *v1alpha1.PackageManifest) {
 	}
 }
 
-func printRepositories(pkg *v1alpha1.ClusterPackage, repos []v1alpha1.PackageRepository) {
+func printRepositories(pkg ctrlpkg.Package, repos []v1alpha1.PackageRepository) {
 	for _, repo := range repos {
 		fmt.Fprintf(os.Stderr, " * %v", repo.Name)
 		if isInstalledFrom(pkg, repo) {
@@ -165,7 +233,7 @@ func printRepositories(pkg *v1alpha1.ClusterPackage, repos []v1alpha1.PackageRep
 	}
 }
 
-func repositoriesAsMap(pkg *v1alpha1.ClusterPackage, repos []v1alpha1.PackageRepository) []map[string]any {
+func repositoriesAsMap(pkg ctrlpkg.Package, repos []v1alpha1.PackageRepository) []map[string]any {
 	repositories := make([]map[string]any, 0, len(repos))
 	for _, repo := range repos {
 		repositories = append(repositories, map[string]any{
@@ -176,18 +244,18 @@ func repositoriesAsMap(pkg *v1alpha1.ClusterPackage, repos []v1alpha1.PackageRep
 	return repositories
 }
 
-func isInstalledFrom(pkg *v1alpha1.ClusterPackage, repo v1alpha1.PackageRepository) bool {
-	return pkg != nil &&
-		(repo.Name == pkg.Spec.PackageInfo.RepositoryName ||
-			(len(pkg.Spec.PackageInfo.RepositoryName) == 0 && repo.IsDefaultRepository()))
+func isInstalledFrom(pkg ctrlpkg.Package, repo v1alpha1.PackageRepository) bool {
+	return !pkg.IsNil() &&
+		(repo.Name == pkg.GetSpec().PackageInfo.RepositoryName ||
+			(len(pkg.GetSpec().PackageInfo.RepositoryName) == 0 && repo.IsDefaultRepository()))
 }
 
-func printReferences(ctx context.Context, pkg *v1alpha1.ClusterPackage, manifest *v1alpha1.PackageManifest) {
+func printReferences(ctx context.Context, pkg ctrlpkg.Package, manifest *v1alpha1.PackageManifest) {
 	repo := cliutils.RepositoryClientset(ctx)
 	var repoClient repoclient.RepoClient
-	if pkg != nil {
+	if !pkg.IsNil() {
 		repoClient = repo.ForPackage(pkg)
-		if url, err := repoClient.GetPackageManifestURL(manifest.Name, pkg.Spec.PackageInfo.Version); err != nil {
+		if url, err := repoClient.GetPackageManifestURL(manifest.Name, pkg.GetSpec().PackageInfo.Version); err != nil {
 			fmt.Fprintf(os.Stderr, "❌ Could not get package manifest url: %v\n", err)
 		} else {
 			fmt.Printf(" * Glasskube Package Manifest: %v\n", url)
@@ -200,7 +268,7 @@ func printReferences(ctx context.Context, pkg *v1alpha1.ClusterPackage, manifest
 
 func referencesAsMap(
 	ctx context.Context,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
 	manifest *v1alpha1.PackageManifest,
 ) []map[string]string {
 	references := []map[string]string{}
@@ -210,10 +278,10 @@ func referencesAsMap(
 		reference["url"] = ref.Url
 		references = append(references, reference)
 	}
-	if pkg != nil {
+	if !pkg.IsNil() {
 		repo := cliutils.RepositoryClientset(ctx)
 		repoClient := repo.ForPackage(pkg)
-		if url, err := repoClient.GetPackageManifestURL(manifest.Name, pkg.Spec.PackageInfo.Version); err == nil {
+		if url, err := repoClient.GetPackageManifestURL(manifest.Name, pkg.GetSpec().PackageInfo.Version); err == nil {
 			reference := make(map[string]string)
 			reference["label"] = "Glasskube Package Manifest"
 			reference["url"] = url
@@ -245,7 +313,7 @@ func printMarkdown(w io.Writer, text string) {
 	}
 }
 
-func status(pkg *v1alpha1.ClusterPackage) string {
+func status(pkg ctrlpkg.Package) string {
 	pkgStatus := client.GetStatusOrPending(pkg)
 	if pkgStatus != nil {
 		switch pkgStatus.Status {
@@ -261,16 +329,18 @@ func status(pkg *v1alpha1.ClusterPackage) string {
 	}
 }
 
-func version(pkg *v1alpha1.ClusterPackage, latestVersion string) string {
-	if pkg != nil {
+func version(pkg ctrlpkg.Package, latestVersion string) string {
+	if !pkg.IsNil() {
 		var parts []string
-		if len(pkg.Status.Version) > 0 {
-			parts = append(parts, pkg.Status.Version)
+		if len(pkg.GetStatus().Version) > 0 {
+			parts = append(parts, pkg.GetStatus().Version)
+		} else {
+			parts = append(parts, "n/a")
 		}
-		if pkg.Spec.PackageInfo.Version != pkg.Status.Version {
-			parts = append(parts, fmt.Sprintf("(desired: %v)", pkg.Spec.PackageInfo.Version))
+		if pkg.GetSpec().PackageInfo.Version != pkg.GetStatus().Version {
+			parts = append(parts, fmt.Sprintf("(desired: %v)", pkg.GetSpec().PackageInfo.Version))
 		}
-		if semver.IsUpgradable(pkg.Spec.PackageInfo.Version, latestVersion) {
+		if semver.IsUpgradable(pkg.GetSpec().PackageInfo.Version, latestVersion) {
 			parts = append(parts, fmt.Sprintf("(latest: %v)", latestVersion))
 		}
 		return strings.Join(parts, " ")
@@ -292,7 +362,8 @@ func nameAndDescription(manifest *v1alpha1.PackageManifest) string {
 
 func createOutputStructure(
 	ctx context.Context,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
+	instances []v1alpha1.Package,
 	manifest *v1alpha1.PackageManifest,
 	latestVersion string,
 	repos []v1alpha1.PackageRepository,
@@ -308,23 +379,27 @@ func createOutputStructure(
 		"repositories":     repositoriesAsMap(pkg, repos),
 		"references":       referencesAsMap(ctx, pkg, manifest),
 	}
-	if pkg != nil {
-		data["desiredVersion"] = pkg.Spec.PackageInfo.Version
-		data["configuration"] = pkg.Spec.Values
-		data["version"] = pkg.Status.Version
+	if !pkg.IsNil() {
+		data["desiredVersion"] = pkg.GetSpec().PackageInfo.Version
+		data["configuration"] = pkg.GetSpec().Values
+		data["version"] = pkg.GetStatus().Version
 		data["autoUpdate"] = pkg.AutoUpdatesEnabled()
-		data["isUpgradable"] = semver.IsUpgradable(pkg.Spec.PackageInfo.Version, latestVersion)
+		data["isUpgradable"] = semver.IsUpgradable(pkg.GetSpec().PackageInfo.Version, latestVersion)
 		data["status"] = client.GetStatusOrPending(pkg).Status
 	}
+	if len(instances) > 0 {
+		data["instances"] = instances
+	}
 	return data
 }
 
 func printJSON(ctx context.Context,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
+	pkgs []v1alpha1.Package,
 	manifest *v1alpha1.PackageManifest,
 	latestVersion string,
 	repos []v1alpha1.PackageRepository) {
-	output := createOutputStructure(ctx, pkg, manifest, latestVersion, repos)
+	output := createOutputStructure(ctx, pkg, pkgs, manifest, latestVersion, repos)
 	jsonOutput, err := json.MarshalIndent(output, "", "  ")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "❌ Could not marshal JSON output: %v\n", err)
@@ -334,11 +409,12 @@ func printJSON(ctx context.Context,
 }
 
 func printYAML(ctx context.Context,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
+	pkgs []v1alpha1.Package,
 	manifest *v1alpha1.PackageManifest,
 	latestVersion string,
 	repos []v1alpha1.PackageRepository) {
-	output := createOutputStructure(ctx, pkg, manifest, latestVersion, repos)
+	output := createOutputStructure(ctx, pkg, pkgs, manifest, latestVersion, repos)
 	yamlOutput, err := yaml.Marshal(output)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "❌ Could not marshal YAML output: %v\n", err)
@@ -350,6 +426,8 @@ func printYAML(ctx context.Context,
 func init() {
 	describeCmd.Flags().StringVar(&describeCmdOptions.repository, "repository", describeCmdOptions.repository,
 		"specify the name of the package repository used to use when the package is not installed")
-	RootCmd.AddCommand(describeCmd)
 	describeCmdOptions.OutputOptions.AddFlagsToCommand(describeCmd)
+	describeCmdOptions.KindOptions.AddFlagsToCommand(describeCmd)
+	describeCmdOptions.NamespaceOptions.AddFlagsToCommand(describeCmd)
+	RootCmd.AddCommand(describeCmd)
 }
diff --git a/cmd/glasskube/cmd/install.go b/cmd/glasskube/cmd/install.go
index eb9403d6f..e62d3a315 100644
--- a/cmd/glasskube/cmd/install.go
+++ b/cmd/glasskube/cmd/install.go
@@ -11,6 +11,7 @@ import (
 	"github.com/glasskube/glasskube/internal/clicontext"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/internal/config"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	"github.com/glasskube/glasskube/internal/dependency"
 	"github.com/glasskube/glasskube/internal/manifestvalues/cli"
 	"github.com/glasskube/glasskube/internal/manifestvalues/flags"
@@ -38,16 +39,16 @@ var installCmdOptions = struct {
 	Yes               bool
 	DryRun            bool
 	OutputOptions
+	NamespaceOptions
 }{
 	ValuesOptions: flags.NewOptions(),
-	OutputOptions: OutputOptions{},
 }
 
 var installCmd = &cobra.Command{
-	Use:               "install [package-name]",
+	Use:               "install <package-name> [<name>]",
 	Short:             "Install a package",
 	Long:              `Install a package.`,
-	Args:              cobra.ExactArgs(1),
+	Args:              cobra.RangeArgs(1, 2),
 	PreRun:            cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
 	ValidArgsFunction: completeAvailablePackageNames,
 	Run: func(cmd *cobra.Command, args []string) {
@@ -65,7 +66,7 @@ var installCmd = &cobra.Command{
 
 		bold := color.New(color.Bold).SprintFunc()
 		packageName := args[0]
-		pkgBuilder := client.ClusterPackageBuilder(packageName)
+		pkgBuilder := client.PackageBuilder(packageName)
 		var repoClient repoclient.RepoClient
 
 		if len(installCmdOptions.Repository) > 0 {
@@ -118,15 +119,48 @@ var installCmd = &cobra.Command{
 
 		pkgBuilder.WithVersion(installCmdOptions.Version)
 
-		installationPlan := []dependency.Requirement{
-			{PackageWithVersion: dependency.PackageWithVersion{Name: packageName, Version: installCmdOptions.Version}},
-		}
-
 		var manifest v1alpha1.PackageManifest
 		if err := repoClient.FetchPackageManifest(packageName, installCmdOptions.Version, &manifest); err != nil {
 			fmt.Fprintf(os.Stderr, "❗ Error: Could not fetch package manifest: %v\n", err)
 			cliutils.ExitWithError()
-		} else if validationResult, err :=
+		}
+
+		installationPlan := []dependency.Requirement{}
+		if manifest.Scope.IsCluster() {
+			if len(args) != 1 {
+				fmt.Fprintf(os.Stderr,
+					"❌ %v has scope Cluster. Specifying an instance name for a ClusterPackage is not possible\n",
+					packageName)
+				cliutils.ExitWithError()
+			}
+			installationPlan = append(installationPlan,
+				dependency.Requirement{PackageWithVersion: dependency.PackageWithVersion{
+					Name:    packageName,
+					Version: installCmdOptions.Version,
+				}},
+			)
+		} else {
+			var name string
+			if len(args) != 2 {
+				fmt.Fprintf(os.Stderr, "%v has scope Namespaced. Please enter a name (default %v):\n", packageName, packageName)
+				name = cliutils.GetInputStr("name")
+				if name == "" {
+					name = packageName
+				}
+			} else {
+				name = args[1]
+			}
+			ns := installCmdOptions.GetActualNamespace(ctx)
+			pkgBuilder.WithName(name).WithNamespace(ns)
+			installationPlan = append(installationPlan,
+				dependency.Requirement{PackageWithVersion: dependency.PackageWithVersion{
+					Name:    fmt.Sprintf("%v of type %v in namespace %v", name, packageName, ns),
+					Version: installCmdOptions.Version,
+				}},
+			)
+		}
+
+		if validationResult, err :=
 			dm.Validate(ctx, &manifest, installCmdOptions.Version); err != nil {
 			fmt.Fprintf(os.Stderr, "❗ Error: Could not validate dependencies: %v\n", err)
 			cliutils.ExitWithError()
@@ -159,7 +193,7 @@ var installCmd = &cobra.Command{
 
 		pkgBuilder.WithAutoUpdates(installCmdOptions.EnableAutoUpdates)
 
-		pkg := pkgBuilder.Build()
+		pkg := pkgBuilder.Build(manifest.Scope)
 
 		fmt.Fprintln(os.Stderr, bold("Summary:"))
 		fmt.Fprintf(os.Stderr, " * The following packages will be installed in your cluster (%v):\n", config.CurrentContext)
@@ -172,10 +206,10 @@ var installCmd = &cobra.Command{
 			fmt.Fprintln(os.Stderr, " * Automatic updates will be", bold("not enabled"))
 		}
 
-		if len(pkg.Spec.Values) > 0 {
+		if len(pkg.GetSpec().Values) > 0 {
 			fmt.Fprintln(os.Stderr, bold("Configuration:"))
-			printValueConfigurations(os.Stderr, pkg.Spec.Values)
-			if _, err := valueResolver.Resolve(ctx, pkg.Spec.Values); err != nil {
+			printValueConfigurations(os.Stderr, pkg.GetSpec().Values)
+			if _, err := valueResolver.Resolve(ctx, pkg.GetSpec().Values); err != nil {
 				fmt.Fprintf(os.Stderr, "⚠️  Some values can not be resolved: %v\n", err)
 			}
 		}
@@ -228,7 +262,7 @@ var installCmd = &cobra.Command{
 	},
 }
 
-func formatOutput(pkg *v1alpha1.ClusterPackage, format OutputFormat) (string, error) {
+func formatOutput(pkg ctrlpkg.Package, format OutputFormat) (string, error) {
 	if gvks, _, err := scheme.Scheme.ObjectKinds(pkg); err == nil && len(gvks) == 1 {
 		pkg.SetGroupVersionKind(gvks[0])
 	}
@@ -328,5 +362,6 @@ func init() {
 	installCmd.MarkFlagsMutuallyExclusive("version", "enable-auto-updates")
 	installCmdOptions.ValuesOptions.AddFlagsToCommand(installCmd)
 	installCmdOptions.OutputOptions.AddFlagsToCommand(installCmd)
+	installCmdOptions.NamespaceOptions.AddFlagsToCommand(installCmd)
 	RootCmd.AddCommand(installCmd)
 }
diff --git a/cmd/glasskube/cmd/kind_options.go b/cmd/glasskube/cmd/kind_options.go
index ebaeb636b..6b66671df 100644
--- a/cmd/glasskube/cmd/kind_options.go
+++ b/cmd/glasskube/cmd/kind_options.go
@@ -39,7 +39,7 @@ func (kind *ResourceKind) String() string {
 
 // Type implements pflag.Value.
 func (r *ResourceKind) Type() string {
-	return fmt.Sprintf("[%v|%v]", KindPackage, KindClusterPackage)
+	return fmt.Sprintf("(%v|%v)", KindPackage, KindClusterPackage)
 }
 
 type KindOptions struct {
@@ -52,8 +52,7 @@ func (opts *KindOptions) AddFlagsToCommand(cmd *cobra.Command) {
 
 func DefaultKindOptions() KindOptions {
 	return KindOptions{
-		// TODO: Change to KindUnspecified to support namespaced packages
-		Kind: KindClusterPackage,
+		Kind: KindUnspecified,
 	}
 }
 
@@ -105,7 +104,7 @@ func getPackageOrClusterPackage(
 	pNotFound := !pkgTried || errp != nil
 	cpNotFound := !cpkgTried || errcp != nil
 	if pNotFound && cpNotFound {
-		return nil, fmt.Errorf("no Package or ClusterPackage found with name %v", name)
+		return nil, fmt.Errorf("no Package or ClusterPackage found with name %v: %w; %w", name, errp, errcp)
 	} else if !pNotFound && !cpNotFound {
 		return nil, fmt.Errorf("both Package and ClusterPackage found with name %v. Please specify the kind explicitly", name)
 	} else if !pNotFound && cpNotFound {
diff --git a/cmd/glasskube/cmd/list.go b/cmd/glasskube/cmd/list.go
index a87ff38a6..7d5cf4d8f 100644
--- a/cmd/glasskube/cmd/list.go
+++ b/cmd/glasskube/cmd/list.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/internal/clientutils"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/internal/semver"
@@ -21,6 +23,7 @@ type ListCmdOptions struct {
 	ShowLatestVersion bool
 	More              bool
 	OutputOptions
+	KindOptions
 }
 
 func (o ListCmdOptions) toListOptions() list.ListOptions {
@@ -30,7 +33,9 @@ func (o ListCmdOptions) toListOptions() list.ListOptions {
 	}
 }
 
-var listCmdOptions = ListCmdOptions{}
+var listCmdOptions = ListCmdOptions{
+	KindOptions: DefaultKindOptions(),
+}
 
 var listCmd = &cobra.Command{
 	Use:     "list",
@@ -45,49 +50,55 @@ var listCmd = &cobra.Command{
 			listCmdOptions.ShowLatestVersion = true
 			listCmdOptions.ShowDescription = true
 		}
-		pkgs, err := list.NewLister(ctx).GetPackagesWithStatus(ctx, listCmdOptions.toListOptions())
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "❗ An error occurred listing packages: %v\n", err)
-			if len(pkgs) == 0 {
-				cliutils.ExitWithError()
-			} else {
-				fmt.Fprint(os.Stderr, "⚠️  The table shown below may be incomplete due to the error above.\n\n")
-			}
+		lister := list.NewListerWithRepoCache(ctx)
+		var clPkgs []*list.PackageWithStatus
+		var pkgs []*list.PackagesWithStatus
+		var err error
+		if listCmdOptions.Kind != KindPackage {
+			clPkgs, err = lister.GetClusterPackagesWithStatus(ctx, listCmdOptions.toListOptions())
+			handleListErr(len(clPkgs), err, "clusterpackages")
 		}
-		if len(pkgs) == 0 {
-			if listCmdOptions.ListOutdatedOnly {
-				fmt.Fprintln(os.Stderr, "All installed packages are up-to-date.")
-			} else if listCmdOptions.ListInstalledOnly {
-				fmt.Fprintln(os.Stderr, "There are currently no packages installed in your cluster.\n"+
-					"Run \"glasskube help install\" to get started.")
-			} else {
-				fmt.Fprintln(os.Stderr, "No packages found. This is probably a bug.")
+		if listCmdOptions.Kind != KindClusterPackage {
+			pkgs, err = lister.GetPackagesWithStatus(ctx, listCmdOptions.toListOptions())
+			handleListErr(len(pkgs), err, "packages")
+		}
+		noPkgs := len(pkgs) == 0 && listCmdOptions.Kind != KindClusterPackage
+		noClPkgs := len(clPkgs) == 0 && listCmdOptions.Kind != KindPackage
+		if noPkgs {
+			handleEmptyList("packages")
+		} else if len(pkgs) > 0 {
+			printPackageTable(pkgs)
+			if listCmdOptions.Kind != KindPackage {
+				fmt.Fprintln(os.Stderr, "")
 			}
-		} else {
+		}
+		if noClPkgs {
+			handleEmptyList("clusterpackages")
+		} else if len(clPkgs) > 0 {
 			if listCmdOptions.Output == OutputFormatJSON {
-				printPackageJSON(pkgs)
+				printPackageJSON(clPkgs)
 			} else if listCmdOptions.Output == OutputFormatYAML {
-				printPackageYAML(pkgs)
+				printPackageYAML(clPkgs)
 			} else {
-				printPackageTable(pkgs)
+				printClusterPackageTable(clPkgs)
 			}
 		}
-
 	},
 }
 
 func init() {
 	listCmd.PersistentFlags().BoolVarP(&listCmdOptions.ListInstalledOnly, "installed", "i", false,
-		"list only installed packages")
+		"list only installed (cluster-)packages")
 	listCmd.PersistentFlags().BoolVar(&listCmdOptions.ListOutdatedOnly, "outdated", false,
-		"list only outdated packages")
+		"list only outdated (cluster-)packages")
 	listCmd.PersistentFlags().BoolVar(&listCmdOptions.ShowDescription, "show-description", false,
-		"show the package description")
+		"show the (cluster-)package description")
 	listCmd.PersistentFlags().BoolVar(&listCmdOptions.ShowLatestVersion, "show-latest", false,
-		"show the latest version of packages if available")
+		"show the latest version of (cluster-)packages if available")
 	listCmd.PersistentFlags().BoolVarP(&listCmdOptions.More, "more", "m", false,
-		"show additional information about packages (like --show-description --show-latest)")
+		"show additional information about (cluster-)packages (like --show-description --show-latest)")
 	listCmdOptions.OutputOptions.AddFlagsToCommand(listCmd)
+	listCmdOptions.KindOptions.AddFlagsToCommand(listCmd)
 
 	listCmd.MarkFlagsMutuallyExclusive("show-description", "more")
 	listCmd.MarkFlagsMutuallyExclusive("show-latest", "more")
@@ -95,7 +106,29 @@ func init() {
 	RootCmd.AddCommand(listCmd)
 }
 
-func printPackageTable(packages []*list.PackageWithStatus) {
+func handleListErr(listLen int, err error, resource string) {
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "❗ An error occurred listing %s: %v\n", resource, err)
+		if listLen == 0 {
+			cliutils.ExitWithError()
+		} else {
+			fmt.Fprint(os.Stderr, "⚠️  The table shown below may be incomplete due to the error above.\n\n")
+		}
+	}
+}
+
+func handleEmptyList(resource string) {
+	if listCmdOptions.ListOutdatedOnly {
+		fmt.Fprintf(os.Stderr, "All installed %s are up-to-date.\n", resource)
+	} else if listCmdOptions.ListInstalledOnly {
+		fmt.Fprintf(os.Stderr, "There are currently no %s installed in your cluster.\n"+
+			"Run \"glasskube help install\" to get started.\n", resource)
+	} else {
+		fmt.Fprintf(os.Stderr, "No %s found in the available repositories.\n", resource)
+	}
+}
+
+func printClusterPackageTable(packages []*list.PackageWithStatus) {
 	header := []string{"NAME", "STATUS", "VERSION", "AUTO-UPDATE"}
 	if listCmdOptions.ShowLatestVersion {
 		header = append(header, "LATEST VERSION")
@@ -104,11 +137,67 @@ func printPackageTable(packages []*list.PackageWithStatus) {
 	if listCmdOptions.ShowDescription {
 		header = append(header, "DESCRIPTION")
 	}
+
 	err := cliutils.PrintTable(os.Stdout,
 		packages,
 		header,
 		func(pkg *list.PackageWithStatus) []string {
-			row := []string{pkg.Name, statusString(*pkg), versionString(*pkg), clientutils.AutoUpdateString(pkg.Package, "")}
+			row := []string{pkg.Name, statusString(*pkg), versionString(*pkg),
+				clientutils.AutoUpdateString(pkg.ClusterPackage, "")}
+			if listCmdOptions.ShowLatestVersion {
+				row = append(row, pkg.LatestVersion)
+			}
+			s := make([]string, len(pkg.Repos))
+			if pkg.ClusterPackage != nil {
+				for i, r := range pkg.Repos {
+					if pkg.ClusterPackage.Spec.PackageInfo.RepositoryName == r {
+						s[i] = fmt.Sprintf("%v (used)", r)
+					} else {
+						s[i] = r
+					}
+				}
+			} else {
+				s = pkg.Repos
+			}
+			row = append(row, strings.Join(s, ", "))
+			if listCmdOptions.ShowDescription {
+				row = append(row, pkg.ShortDescription)
+			}
+			return row
+		})
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "There was an error displaying the clusterpackage table:\n%v\n(This is a bug)\n", err)
+		cliutils.ExitWithError()
+	}
+}
+
+func printPackageTable(packages []*list.PackagesWithStatus) {
+	header := []string{"PACKAGENAME", "NAMESPACE", "NAME", "STATUS", "VERSION", "AUTO-UPDATE"}
+	if listCmdOptions.ShowLatestVersion {
+		header = append(header, "LATEST VERSION")
+	}
+	header = append(header, "REPOSITORY")
+	if listCmdOptions.ShowDescription {
+		header = append(header, "DESCRIPTION")
+	}
+
+	var flattenedPkgs []*list.PackageWithStatus
+	for _, pkgs := range packages {
+		if len(pkgs.Packages) == 0 {
+			flattenedPkgs = append(flattenedPkgs, &list.PackageWithStatus{
+				MetaIndexItem: pkgs.MetaIndexItem,
+			})
+		} else {
+			flattenedPkgs = append(flattenedPkgs, pkgs.Packages...)
+		}
+	}
+
+	err := cliutils.PrintTable(os.Stdout,
+		flattenedPkgs,
+		header,
+		func(pkg *list.PackageWithStatus) []string {
+			row := []string{pkg.Name, pkgNamespaceString(*pkg), pkgNameString(*pkg), statusString(*pkg), versionString(*pkg),
+				clientutils.AutoUpdateString(pkg.Package, "")}
 			if listCmdOptions.ShowLatestVersion {
 				row = append(row, pkg.LatestVersion)
 			}
@@ -147,7 +236,6 @@ func printPackageJSON(packages []*list.PackageWithStatus) {
 }
 
 func printPackageYAML(packages []*list.PackageWithStatus) {
-
 	for i, pkg := range packages {
 		yamlData, err := yaml.Marshal(pkg)
 		if err != nil {
@@ -163,6 +251,22 @@ func printPackageYAML(packages []*list.PackageWithStatus) {
 	}
 }
 
+func pkgNamespaceString(pkg list.PackageWithStatus) string {
+	if pkg.Package != nil {
+		return pkg.Package.Namespace
+	} else {
+		return ""
+	}
+}
+
+func pkgNameString(pkg list.PackageWithStatus) string {
+	if pkg.Package != nil {
+		return pkg.Package.Name
+	} else {
+		return ""
+	}
+}
+
 func statusString(pkg list.PackageWithStatus) string {
 	if pkg.Status != nil {
 		return pkg.Status.Status
@@ -172,9 +276,15 @@ func statusString(pkg list.PackageWithStatus) string {
 }
 
 func versionString(pkg list.PackageWithStatus) string {
-	if pkg.Package != nil {
-		specVersion := pkg.Package.Spec.PackageInfo.Version
-		statusVersion := pkg.Package.Status.Version
+	var p ctrlpkg.Package
+	if pkg.ClusterPackage != nil {
+		p = pkg.ClusterPackage
+	} else if pkg.Package != nil {
+		p = pkg.Package
+	}
+	if pkg.ClusterPackage != nil || pkg.Package != nil {
+		specVersion := p.GetSpec().PackageInfo.Version
+		statusVersion := p.GetStatus().Version
 		repoVersion := pkg.LatestVersion
 
 		if statusVersion != "" {
diff --git a/cmd/glasskube/cmd/namespace_options.go b/cmd/glasskube/cmd/namespace_options.go
index 2ebec1b8c..aaae9c049 100644
--- a/cmd/glasskube/cmd/namespace_options.go
+++ b/cmd/glasskube/cmd/namespace_options.go
@@ -16,8 +16,8 @@ func (opt *NamespaceOptions) AddFlagsToCommand(cmd *cobra.Command) {
 }
 
 func (opt *NamespaceOptions) GetActualNamespace(ctx context.Context) string {
-	if configureCmdOptions.Namespace != "" {
-		return configureCmdOptions.Namespace
+	if opt.Namespace != "" {
+		return opt.Namespace
 	} else {
 		rawConfig := clicontext.RawConfigFromContext(ctx)
 		if current, ok := rawConfig.Contexts[rawConfig.CurrentContext]; ok && current.Namespace != "" {
diff --git a/cmd/glasskube/cmd/open.go b/cmd/glasskube/cmd/open.go
index 36f2d9693..3835e80b4 100644
--- a/cmd/glasskube/cmd/open.go
+++ b/cmd/glasskube/cmd/open.go
@@ -24,7 +24,7 @@ var (
 )
 
 var openCmd = &cobra.Command{
-	Use:   "open [package-name] [entrypoint]",
+	Use:   "open <package-name> [<entrypoint>]",
 	Short: "Open the Web UI of a package",
 	Long: `Open the Web UI of a package.
 If the package manifest has more than one entrypoint, specify the name of the entrypoint to open.`,
@@ -89,9 +89,8 @@ If the package manifest has more than one entrypoint, specify the name of the en
 }
 
 func init() {
-	// TODO: Enable these flags to support namespaced packages
-	// openCmdOptions.KindOptions.AddFlagsToCommand(openCmd)
-	// openCmdOptions.NamespaceOptions.AddFlagsToCommand(openCmd)
+	openCmdOptions.KindOptions.AddFlagsToCommand(openCmd)
+	openCmdOptions.NamespaceOptions.AddFlagsToCommand(openCmd)
 	openCmd.Flags().Int32Var(&openCmdOptions.Port, "port", openCmdOptions.Port, "custom port for opening the package")
 	RootCmd.AddCommand(openCmd)
 }
diff --git a/cmd/glasskube/cmd/output_options.go b/cmd/glasskube/cmd/output_options.go
index 420055114..cfafa7e40 100644
--- a/cmd/glasskube/cmd/output_options.go
+++ b/cmd/glasskube/cmd/output_options.go
@@ -28,7 +28,7 @@ func (of *OutputFormat) Set(value string) error {
 }
 
 func (of *OutputFormat) Type() string {
-	return fmt.Sprintf("[%v|%v]", OutputFormatJSON, OutputFormatYAML)
+	return fmt.Sprintf("(%v|%v)", OutputFormatJSON, OutputFormatYAML)
 }
 
 type OutputOptions struct {
diff --git a/cmd/glasskube/cmd/repo_add.go b/cmd/glasskube/cmd/repo_add.go
index f86a996d9..a662ea3e3 100644
--- a/cmd/glasskube/cmd/repo_add.go
+++ b/cmd/glasskube/cmd/repo_add.go
@@ -14,7 +14,7 @@ import (
 var repoAddCmdOptions = repoOptions{}
 
 var repoAddCmd = &cobra.Command{
-	Use:    "add [name] [url]",
+	Use:    "add <name> <url>",
 	Short:  "Add a package repository to the current cluster",
 	Args:   cobra.ExactArgs(2),
 	PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
diff --git a/cmd/glasskube/cmd/repo_delete.go b/cmd/glasskube/cmd/repo_delete.go
new file mode 100644
index 000000000..8890dac1d
--- /dev/null
+++ b/cmd/glasskube/cmd/repo_delete.go
@@ -0,0 +1,86 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/cliutils"
+	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+var repoDeleteCmd = &cobra.Command{
+	Use:    "delete [repositoryName]",
+	Short:  "Delete a repository",
+	Args:   cobra.ExactArgs(1),
+	PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
+	Run: func(cmd *cobra.Command, args []string) {
+		repositoryName := args[0]
+		ctx := cmd.Context()
+		deleteRepository(ctx, repositoryName)
+	},
+}
+
+func deleteRepository(ctx context.Context, repoName string) {
+	client := cliutils.PackageClient(ctx)
+
+	var targetRepo v1alpha1.PackageRepository
+	if err := client.PackageRepositories().Get(ctx, repoName, &targetRepo); err != nil {
+		fmt.Fprintf(os.Stderr, "❌ error listing package repository: %v\n", err)
+		cliutils.ExitWithError()
+	}
+
+	var pkgs v1alpha1.PackageList
+	if err := client.Packages("").GetAll(ctx, &pkgs); err != nil {
+		fmt.Fprintf(os.Stderr, "Could not list packages: %v", err)
+		cliutils.ExitWithError()
+	}
+
+	var clpkgs v1alpha1.ClusterPackageList
+	if err := client.ClusterPackages().GetAll(ctx, &clpkgs); err != nil {
+		fmt.Fprintf(os.Stderr, "Could not list Cluster packages: %v", err)
+		cliutils.ExitWithError()
+	}
+
+	repoPackages := getPackagesFromRepo(clpkgs, pkgs, repoName)
+	if len(repoPackages) > 0 {
+		fmt.Printf("Repository %s cannot be deleted, because the following packages are installed from this repository: %v\n",
+			repoName, strings.Join(repoPackages, ", "))
+		cliutils.ExitWithError()
+	}
+
+	if !cliutils.YesNoPrompt(fmt.Sprintf("Repository %s will now be deleted. Do you want to continue?", repoName), false) {
+		fmt.Println("❌ Repository Deletion Cancelled")
+		cliutils.ExitWithError()
+	}
+	err := client.PackageRepositories().Delete(ctx, &targetRepo, metav1.DeleteOptions{})
+	if err != nil {
+		fmt.Println("Error deleting repository:", err)
+		cliutils.ExitWithError()
+	}
+
+	fmt.Printf("Repository %s has been deleted.\n", repoName)
+}
+
+func getPackagesFromRepo(clpkgs v1alpha1.ClusterPackageList, pkgs v1alpha1.PackageList, repoName string) []string {
+	var repoPackages []string
+	for _, clpkg := range clpkgs.Items {
+		if clpkg.Spec.PackageInfo.RepositoryName == repoName {
+			repoPackages = append(repoPackages, clpkg.Name)
+		}
+	}
+
+	for _, pkg := range pkgs.Items {
+		if pkg.Spec.PackageInfo.RepositoryName == repoName {
+			repoPackages = append(repoPackages, pkg.Name)
+		}
+	}
+	return repoPackages
+}
+
+func init() {
+	repoCmd.AddCommand(repoDeleteCmd)
+}
diff --git a/cmd/glasskube/cmd/repo_options.go b/cmd/glasskube/cmd/repo_options.go
index ad02ebe74..b0ffdc5b3 100644
--- a/cmd/glasskube/cmd/repo_options.go
+++ b/cmd/glasskube/cmd/repo_options.go
@@ -28,7 +28,7 @@ func (t *repoAuthType) Set(v string) error {
 }
 
 func (e *repoAuthType) Type() string {
-	return fmt.Sprintf("[%v|%v|%v]", repoNoAuth, repoBasicAuth, repoBearerAuth)
+	return fmt.Sprintf("(%v|%v|%v)", repoNoAuth, repoBasicAuth, repoBearerAuth)
 }
 
 const (
diff --git a/cmd/glasskube/cmd/repo_update.go b/cmd/glasskube/cmd/repo_update.go
index a1b685f31..3836267dc 100644
--- a/cmd/glasskube/cmd/repo_update.go
+++ b/cmd/glasskube/cmd/repo_update.go
@@ -13,7 +13,7 @@ import (
 var repoUpdateCmdOptions = repoOptions{}
 
 var repoUpdateCmd = &cobra.Command{
-	Use:    "update [name]",
+	Use:    "update <name>",
 	Short:  "Update a package repository for the current cluster",
 	Args:   cobra.ExactArgs(1),
 	PreRun: cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
diff --git a/cmd/glasskube/cmd/telemetry.go b/cmd/glasskube/cmd/telemetry.go
index 0ac98d374..ea713d811 100644
--- a/cmd/glasskube/cmd/telemetry.go
+++ b/cmd/glasskube/cmd/telemetry.go
@@ -39,7 +39,7 @@ var telemetryStatusCmd = &cobra.Command{
 }
 
 var telemetryCmd = &cobra.Command{
-	Use:   "telemetry <enable|disable>",
+	Use:   "telemetry (enable|disable)",
 	Short: "View and modify telemetry settings",
 	Long: "View and modify telemetry settings. \n" +
 		"For more information on how Glasskube uses telemetry see https://glasskube.dev/telemetry",
diff --git a/cmd/glasskube/cmd/uninstall.go b/cmd/glasskube/cmd/uninstall.go
index 7fd9d0cb8..6eaaf850e 100644
--- a/cmd/glasskube/cmd/uninstall.go
+++ b/cmd/glasskube/cmd/uninstall.go
@@ -5,22 +5,24 @@ import (
 	"os"
 
 	"github.com/fatih/color"
-	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/clicontext"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/pkg/statuswriter"
 	"github.com/glasskube/glasskube/pkg/uninstall"
 	"github.com/spf13/cobra"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var uninstallCmdOptions = struct {
 	NoWait bool
 	Yes    bool
-}{}
+	KindOptions
+	NamespaceOptions
+}{
+	KindOptions: DefaultKindOptions(),
+}
 
 var uninstallCmd = &cobra.Command{
-	Use:               "uninstall [package-name]",
+	Use:               "uninstall <package-name>",
 	Short:             "Uninstall a package",
 	Long:              `Uninstall a package.`,
 	Args:              cobra.ExactArgs(1),
@@ -32,39 +34,46 @@ var uninstallCmd = &cobra.Command{
 		currentContext := clicontext.RawConfigFromContext(ctx).CurrentContext
 		client := clicontext.PackageClientFromContext(ctx)
 		dm := cliutils.DependencyManager(ctx)
+		uninstaller := uninstall.NewUninstaller(client)
+		if !rootCmdOptions.NoProgress {
+			uninstaller.WithStatusWriter(statuswriter.Spinner())
+		}
 
-		if g, err := dm.NewGraph(ctx); err != nil {
-			fmt.Fprintf(os.Stderr, "❌ Error validating uninstall: %v\n", err)
+		pkg, err := getPackageOrClusterPackage(
+			ctx, pkgName, uninstallCmdOptions.KindOptions, uninstallCmdOptions.NamespaceOptions)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "❌ Could not get resource: %v\n", err)
 			cliutils.ExitWithError()
-		} else {
-			g.Delete(pkgName)
-			pruned := g.Prune()
-			if err := g.Validate(); err != nil {
-				fmt.Fprintf(os.Stderr, "❌ %v can not be uninstalled for the following reason: %v\n", pkgName, err)
+		}
+
+		if !pkg.IsNamespaceScoped() {
+			if g, err := dm.NewGraph(ctx); err != nil {
+				fmt.Fprintf(os.Stderr, "❌ Error validating uninstall: %v\n", err)
 				cliutils.ExitWithError()
 			} else {
-				showUninstallDetails(currentContext, pkgName, pruned)
-				if !uninstallCmdOptions.Yes && !cliutils.YesNoPrompt("Do you want to continue?", false) {
-					fmt.Println("❌ Uninstallation cancelled.")
-					cliutils.ExitSuccess()
+				g.Delete(pkgName)
+				pruned := g.Prune()
+				if err := g.Validate(); err != nil {
+					fmt.Fprintf(os.Stderr, "❌ %v can not be uninstalled for the following reason: %v\n", pkgName, err)
+					cliutils.ExitWithError()
+				} else {
+					showUninstallDetails(currentContext, pkgName, pruned)
+					if !uninstallCmdOptions.Yes && !cliutils.YesNoPrompt("Do you want to continue?", false) {
+						fmt.Println("❌ Uninstallation cancelled.")
+						cliutils.ExitSuccess()
+					}
 				}
 			}
 		}
 
-		uninstaller := uninstall.NewUninstaller(client)
-		if !rootCmdOptions.NoProgress {
-			uninstaller.WithStatusWriter(statuswriter.Spinner())
-		}
-
-		pkg := v1alpha1.ClusterPackage{ObjectMeta: metav1.ObjectMeta{Name: pkgName}}
 		if uninstallCmdOptions.NoWait {
-			if err := uninstaller.Uninstall(ctx, &pkg); err != nil {
+			if err := uninstaller.Uninstall(ctx, pkg); err != nil {
 				fmt.Fprintf(os.Stderr, "\n❌ An error occurred during uninstallation:\n\n%v\n", err)
 				cliutils.ExitWithError()
 			}
 			fmt.Fprintln(os.Stderr, "Uninstallation started in background")
 		} else {
-			if err := uninstaller.UninstallBlocking(ctx, &pkg); err != nil {
+			if err := uninstaller.UninstallBlocking(ctx, pkg); err != nil {
 				fmt.Fprintf(os.Stderr, "\n❌ An error occurred during uninstallation:\n\n%v\n", err)
 				cliutils.ExitWithError()
 			}
@@ -85,6 +94,8 @@ func showUninstallDetails(context, name string, pruned []string) {
 }
 
 func init() {
+	uninstallCmdOptions.KindOptions.AddFlagsToCommand(uninstallCmd)
+	uninstallCmdOptions.NamespaceOptions.AddFlagsToCommand(uninstallCmd)
 	uninstallCmd.PersistentFlags().BoolVar(&uninstallCmdOptions.NoWait, "no-wait", false,
 		"perform non-blocking uninstall")
 	uninstallCmd.PersistentFlags().BoolVarP(&uninstallCmdOptions.Yes, "yes", "y", false,
diff --git a/cmd/glasskube/cmd/update.go b/cmd/glasskube/cmd/update.go
index 3c9029968..3e0fd7413 100644
--- a/cmd/glasskube/cmd/update.go
+++ b/cmd/glasskube/cmd/update.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/clicontext"
 	"github.com/glasskube/glasskube/internal/cliutils"
@@ -21,6 +23,7 @@ import (
 	"github.com/glasskube/glasskube/pkg/update"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/cache"
 	"sigs.k8s.io/yaml"
 )
 
@@ -28,16 +31,17 @@ var updateCmdOptions struct {
 	Version string
 	Yes     bool
 	OutputOptions
+	NamespaceOptions
+	KindOptions
 }
 
 var updateCmd = &cobra.Command{
-	Use:               "update [packages...]",
+	Use:               "update [<package-name>...]",
 	Short:             "Update some or all packages in your cluster",
 	PreRun:            cliutils.SetupClientContext(true, &rootCmdOptions.SkipUpdateCheck),
 	ValidArgsFunction: completeInstalledPackageNames,
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx := cmd.Context()
-		packageNames := args
 
 		updater := update.NewUpdater(ctx)
 		if !rootCmdOptions.NoProgress {
@@ -51,17 +55,51 @@ var updateCmd = &cobra.Command{
 			fmt.Fprintf(os.Stderr, "Updating to specific version is only possible for a single package\n")
 			cliutils.ExitWithError()
 		}
+
 		if len(args) == 1 && updateCmdOptions.Version != "" {
 			if !strings.HasPrefix(updateCmdOptions.Version, "v") {
 				updateCmdOptions.Version = "v" + updateCmdOptions.Version
 			}
-			tx, err = updater.PrepareForVersion(ctx, args[0], updateCmdOptions.Version)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "error in updating the package version : %v\n", err)
+
+			if pkg, err := getPackageOrClusterPackage(ctx, args[0],
+				updateCmdOptions.KindOptions, updateCmdOptions.NamespaceOptions); err != nil {
+				fmt.Fprintf(os.Stderr, "Could not get %v: %v\n", args[0], err)
 				cliutils.ExitWithError()
+			} else {
+				tx, err = updater.PrepareForVersion(ctx, pkg, updateCmdOptions.Version)
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "error in updating the package version : %v\n", err)
+					cliutils.ExitWithError()
+				}
 			}
 		} else {
-			tx, err = updater.Prepare(ctx, packageNames)
+			var updateGetters []update.PackagesGetter
+			if len(args) > 0 {
+				pkgs := make([]ctrlpkg.Package, len(args))
+				for i, name := range args {
+					if pkg, err := getPackageOrClusterPackage(ctx, name,
+						updateCmdOptions.KindOptions, updateCmdOptions.NamespaceOptions); err != nil {
+						fmt.Fprintf(os.Stderr, "Could not get %v: %v\n", name, err)
+						cliutils.ExitWithError()
+					} else {
+						pkgs[i] = pkg
+					}
+				}
+				updateGetters = append(updateGetters, update.GetExact(pkgs))
+			} else if updateCmdOptions.Namespace != "" {
+				updateGetters = append(updateGetters, update.GetAllPackages(updateCmdOptions.Namespace))
+			} else {
+				switch updateCmdOptions.Kind {
+				case KindClusterPackage:
+					updateGetters = append(updateGetters, update.GetAllClusterPackages())
+				case KindPackage:
+					updateGetters = append(updateGetters, update.GetAllPackages(""))
+				default:
+					updateGetters = append(updateGetters, update.GetAllClusterPackages(), update.GetAllPackages(""))
+				}
+			}
+
+			tx, err = updater.Prepare(ctx, updateGetters...)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "❌ update preparation failed: %v\n", err)
 				cliutils.ExitWithError()
@@ -74,7 +112,7 @@ var updateCmd = &cobra.Command{
 				fmt.Fprintf(os.Stderr, "⛔ Update cancelled. No changes were made.\n")
 				cliutils.ExitSuccess()
 			}
-			updatedPackages, err := updater.Apply(ctx, tx)
+			updatedPackages, err := updater.ApplyBlocking(ctx, tx)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "❌ update failed: %v\n", err)
 				cliutils.ExitWithError()
@@ -90,11 +128,18 @@ func printTransaction(tx update.UpdateTransaction) {
 	w := tabwriter.NewWriter(os.Stderr, 0, 0, 1, ' ', 0)
 	for _, item := range tx.Items {
 		if item.UpdateRequired() {
-			fmt.Fprintf(w, "%v:\t%v\t-> %v\n",
-				item.Package.Name, item.Package.Spec.PackageInfo.Version, item.Version)
+			fmt.Fprintf(w, "%v\t%v:\t%v\t-> %v\n",
+				item.Package.GetSpec().PackageInfo.Name,
+				cache.MetaObjectToName(item.Package),
+				item.Package.GetSpec().PackageInfo.Version,
+				item.Version,
+			)
 		} else {
-			fmt.Fprintf(w, "%v:\t%v\t(up-to-date)\n",
-				item.Package.Name, item.Package.Spec.PackageInfo.Version)
+			fmt.Fprintf(w, "%v\t%v:\t%v\t(up-to-date)\n",
+				item.Package.GetSpec().PackageInfo.Name,
+				cache.MetaObjectToName(item.Package),
+				item.Package.GetSpec().PackageInfo.Version,
+			)
 		}
 	}
 	for _, req := range tx.Requirements {
@@ -103,7 +148,7 @@ func printTransaction(tx update.UpdateTransaction) {
 	_ = w.Flush()
 }
 
-func handleOutput(pkgs []v1alpha1.ClusterPackage) {
+func handleOutput(pkgs []ctrlpkg.Package) {
 	if updateCmdOptions.Output == "" {
 		return
 	}
@@ -111,7 +156,7 @@ func handleOutput(pkgs []v1alpha1.ClusterPackage) {
 	var outputData []byte
 	var err error
 	for i := range pkgs {
-		if gvks, _, err := scheme.Scheme.ObjectKinds(&pkgs[i]); err == nil && len(gvks) == 1 {
+		if gvks, _, err := scheme.Scheme.ObjectKinds(pkgs[i]); err == nil && len(gvks) == 1 {
 			pkgs[i].SetGroupVersionKind(gvks[0])
 		} else {
 			fmt.Fprintf(os.Stderr, "❌ failed to set GVK for package: %v\n", err)
@@ -228,5 +273,7 @@ func init() {
 	updateCmd.PersistentFlags().BoolVarP(&updateCmdOptions.Yes, "yes", "y", false,
 		"do not ask for any confirmation")
 	updateCmdOptions.OutputOptions.AddFlagsToCommand(updateCmd)
+	updateCmdOptions.KindOptions.AddFlagsToCommand(updateCmd)
+	updateCmdOptions.NamespaceOptions.AddFlagsToCommand(updateCmd)
 	RootCmd.AddCommand(updateCmd)
 }
diff --git a/cmd/glasskube/cmd/version.go b/cmd/glasskube/cmd/version.go
index 498b82cfa..db9b167d8 100644
--- a/cmd/glasskube/cmd/version.go
+++ b/cmd/glasskube/cmd/version.go
@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/fatih/color"
 	"github.com/glasskube/glasskube/internal/clientutils"
-
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/internal/config"
+	"github.com/glasskube/glasskube/internal/constants"
 	"github.com/spf13/cobra"
 )
 
@@ -17,6 +18,7 @@ var versioncmd = &cobra.Command{
 	Long:   `Print the version of glasskube and package-operator`,
 	PreRun: cliutils.SetupClientContext(false, &rootCmdOptions.SkipUpdateCheck),
 	Run: func(cmd *cobra.Command, args []string) {
+		color.Blue(constants.GlasskubeAscii)
 		glasskubeVersion := config.Version
 		fmt.Fprintf(os.Stderr, "glasskube: v%s\n", glasskubeVersion)
 		operatorVersion, err := clientutils.GetPackageOperatorVersion(cmd.Context())
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 4a440c3dd..5ef32f3e0 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -34,7 +34,7 @@ resources:
 images:
   - name: controller
     newName: ghcr.io/glasskube/package-operator
-    newTag: v0.10.1 # x-release-please-version
+    newTag: v0.11.0 # x-release-please-version
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
index 7af74cd83..8ace40455 100644
--- a/internal/constants/constants.go
+++ b/internal/constants/constants.go
@@ -5,4 +5,11 @@ var (
 	DaemonSet      = "DaemonSet"
 	StatefulSet    = "StatefulSet"
 	DefaultRepoUrl = "https://packages.dl.glasskube.dev/packages"
+	GlasskubeAscii = `
+  ____ _        _    ____ ____  _  ___   _ ____  _____ 
+ / ___| |      / \  / ___/ ___|| |/ / | | | __ )| ____|
+| |  _| |     / _ \ \___ \___ \| ' /| | | |  _ \|  _|  
+| |_| | |___ / ___ \ ___) |__) | . \| |_| | |_) | |___ 
+ \____|_____/_/   \_\____/____/|_|\_\\___/|____/|_____|														  
+	`
 )
diff --git a/internal/controller/ctrlpkg/util.go b/internal/controller/ctrlpkg/util.go
new file mode 100644
index 000000000..eafd8e131
--- /dev/null
+++ b/internal/controller/ctrlpkg/util.go
@@ -0,0 +1,7 @@
+package ctrlpkg
+
+func IsSameResource(a, b Package) bool {
+	return a.GetName() == b.GetName() &&
+		a.GroupVersionKind() == b.GroupVersionKind() &&
+		a.GetNamespace() == b.GetNamespace()
+}
diff --git a/internal/dependency/manager.go b/internal/dependency/manager.go
index 16a53a8f0..b290ebb5a 100644
--- a/internal/dependency/manager.go
+++ b/internal/dependency/manager.go
@@ -98,14 +98,13 @@ func (dm *DependendcyManager) NewGraph(ctx context.Context) (*graph.DependencyGr
 		}
 	}
 
-	// TODO re-enable this when we fully support namespaced packages (this is just a quickfix to avoid client-side rate limits)
-	/*if pkgs, err := dm.pkgClient.ListPackages(ctx, ""); err != nil {
+	if pkgs, err := dm.pkgClient.ListPackages(ctx, ""); err != nil {
 		return nil, err
 	} else {
 		for i := range pkgs.Items {
 			allPkgs = append(allPkgs, &pkgs.Items[i])
 		}
-	}*/
+	}
 
 	g := graph.NewGraph()
 	for _, pkg := range allPkgs {
diff --git a/internal/dependency/manager_test.go b/internal/dependency/manager_test.go
index 6e4d0a06c..e0ccca84c 100644
--- a/internal/dependency/manager_test.go
+++ b/internal/dependency/manager_test.go
@@ -535,8 +535,7 @@ var _ = Describe("Dependency Manager", func() {
 					BeforeEach(func() {
 						ni.Status.Manifest.Dependencies = []v1alpha1.Dependency{{Name: d.Name, Version: "1.x.x"}}
 					})
-					// TODO re-enable
-					/*It("should prevent illegal update of D", func(ctx context.Context) {
+					It("should prevent illegal update of D", func(ctx context.Context) {
 						d, di = createClusterPackageAndInfo("D", "2.0.0", false)
 						res, err := dm.Validate(ctx, di.Status.Manifest, di.Spec.Version)
 						Expect(err).ShouldNot(HaveOccurred())
@@ -544,7 +543,7 @@ var _ = Describe("Dependency Manager", func() {
 						Expect(res.Status).Should(Equal(ValidationResultStatusConflict))
 						Expect(res.Requirements).Should(BeEmpty())
 						Expect(res.Conflicts).Should(HaveLen(1))
-					})*/
+					})
 					It("should allow legal update of D", func(ctx context.Context) {
 						d, di = createClusterPackageAndInfo("D", "1.2.0", false)
 						res, err := dm.Validate(ctx, di.Status.Manifest, di.Spec.Version)
diff --git a/internal/manifestvalues/flags/flags.go b/internal/manifestvalues/flags/flags.go
index 186323f76..75113ee81 100644
--- a/internal/manifestvalues/flags/flags.go
+++ b/internal/manifestvalues/flags/flags.go
@@ -39,7 +39,7 @@ func (opts *ValuesOptions) AddFlagsToCommand(cmd *cobra.Command) {
 	flags.StringArrayVar(&opts.Values, "value", opts.Values,
 		"set a value via flag (can be used multiple times).\n"+
 			"You can create values referencing data in other resources using the following syntax: "+
-			"$<ReferenceKind>$[specifier...].\n"+
+			"$<ReferenceKind>$[<specifier>[,<specifier>...]].\n"+
 			"For example:\n"+
 			" * Reference a ConfigMap key: --value \"name=$ConfigMapRef$namespace,name,key\"\n"+
 			" * Reference a Secret key: --value \"name=$SecretRef$namespace,name,key\"\n"+
diff --git a/internal/repo/types/types.go b/internal/repo/types/types.go
index 47751854b..5619a1fae 100644
--- a/internal/repo/types/types.go
+++ b/internal/repo/types/types.go
@@ -1,5 +1,7 @@
 package types
 
+import "github.com/glasskube/glasskube/api/v1alpha1"
+
 type PackageIndex struct {
 	Versions      []PackageIndexItem `json:"versions" jsonschema:"required"`
 	LatestVersion string             `json:"latestVersion" jsonschema:"required"`
@@ -14,10 +16,11 @@ type PackageRepoIndex struct {
 }
 
 type PackageRepoIndexItem struct {
-	Name             string `json:"name"`
-	ShortDescription string `json:"shortDescription,omitempty"`
-	IconUrl          string `json:"iconUrl,omitempty"`
-	LatestVersion    string `json:"latestVersion,omitempty"`
+	Name             string                 `json:"name"`
+	ShortDescription string                 `json:"shortDescription,omitempty"`
+	IconUrl          string                 `json:"iconUrl,omitempty"`
+	LatestVersion    string                 `json:"latestVersion,omitempty"`
+	Scope            *v1alpha1.PackageScope `json:"scope,omitempty"`
 }
 
 type MetaIndex struct {
diff --git a/internal/telemetry/client.go b/internal/telemetry/client.go
index 0153fe815..555f86a3b 100644
--- a/internal/telemetry/client.go
+++ b/internal/telemetry/client.go
@@ -225,7 +225,7 @@ func HttpMiddleware() func(http.Handler) http.Handler {
 						ev := instance.getBaseEvent("ui_endpoint", false)
 						ev.Properties["$current_url"] = r.URL.String()
 						ev.Properties["method"] = r.Method
-						ev.Properties["path"] = r.URL
+						ev.Properties["path"] = r.URL // TODO exclusions necessary since namespace/name are part of the URL!
 						ev.Properties["execution_time"] = time.Since(start).Milliseconds()
 						ev.Properties["user_agent"] = r.UserAgent()
 						_ = instance.posthog.Enqueue(ev)
diff --git a/internal/web/components/pkg_config_input/controller.go b/internal/web/components/pkg_config_input/controller.go
index 61692846f..d37aded05 100644
--- a/internal/web/components/pkg_config_input/controller.go
+++ b/internal/web/components/pkg_config_input/controller.go
@@ -4,6 +4,10 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/glasskube/glasskube/internal/web/util"
+
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 )
 
@@ -34,11 +38,12 @@ type pkgConfigInputInput struct {
 	ValueError         error
 	Autofocus          bool
 	DatalistOptions    *PkgConfigInputDatalistOptions
+	PackageHref        string
 }
 
-func getStringValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinition *v1alpha1.ValueDefinition) string {
-	if pkg != nil {
-		if valueConfiguration, ok := pkg.Spec.Values[valueName]; ok {
+func getStringValue(pkg ctrlpkg.Package, valueName string, valueDefinition *v1alpha1.ValueDefinition) string {
+	if !pkg.IsNil() {
+		if valueConfiguration, ok := pkg.GetSpec().Values[valueName]; ok {
 			if valueConfiguration.Value != nil {
 				return *valueConfiguration.Value
 			}
@@ -47,7 +52,7 @@ func getStringValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinit
 	return valueDefinition.DefaultValue
 }
 
-func getBoolValue(pkg *v1alpha1.ClusterPackage, valueName string, valueDefinition *v1alpha1.ValueDefinition) bool {
+func getBoolValue(pkg ctrlpkg.Package, valueName string, valueDefinition *v1alpha1.ValueDefinition) bool {
 	if valueDefinition.Type == v1alpha1.ValueTypeBoolean {
 		strVal := getStringValue(pkg, valueName, valueDefinition)
 		if valBool, err := strconv.ParseBool(strVal); err == nil {
@@ -65,9 +70,9 @@ func getLabel(valueName string, valueDefinition *v1alpha1.ValueDefinition) strin
 	return inputLabel
 }
 
-func getExistingReferenceAndKind(pkg *v1alpha1.ClusterPackage, valueName string) (*v1alpha1.ValueReference, string) {
-	if pkg != nil {
-		if val, ok := pkg.Spec.Values[valueName]; ok {
+func getExistingReferenceAndKind(pkg ctrlpkg.Package, valueName string) (*v1alpha1.ValueReference, string) {
+	if !pkg.IsNil() {
+		if val, ok := pkg.GetSpec().Values[valueName]; ok {
 			if val.Value == nil && val.ValueFrom != nil {
 				if val.ValueFrom.ConfigMapRef != nil {
 					return val.ValueFrom, "ConfigMap"
@@ -83,7 +88,7 @@ func getExistingReferenceAndKind(pkg *v1alpha1.ClusterPackage, valueName string)
 }
 
 func getOrCreateReference(
-	pkg *v1alpha1.ClusterPackage, valueName string, desiredRefKind *string) (v1alpha1.ValueReference, string) {
+	pkg ctrlpkg.Package, valueName string, desiredRefKind *string) (v1alpha1.ValueReference, string) {
 	existingReference, existingRefKind := getExistingReferenceAndKind(pkg, valueName)
 	if desiredRefKind != nil && *desiredRefKind != existingRefKind {
 		return v1alpha1.ValueReference{}, *desiredRefKind
@@ -95,10 +100,10 @@ func getOrCreateReference(
 }
 
 func ForPkgConfigInput(
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
 	repositoryName string,
 	selectedVersion string,
-	pkgName string,
+	manifest *v1alpha1.PackageManifest,
 	valueName string,
 	valueDefinition v1alpha1.ValueDefinition,
 	valueError error,
@@ -112,7 +117,7 @@ func ForPkgConfigInput(
 	return &pkgConfigInputInput{
 		RepositoryName:     repositoryName,
 		SelectedVersion:    selectedVersion,
-		PkgName:            pkgName,
+		PkgName:            manifest.Name,
 		ValueName:          valueName,
 		ValueDefinition:    valueDefinition,
 		StringValue:        getStringValue(pkg, valueName, &valueDefinition),
@@ -125,5 +130,6 @@ func ForPkgConfigInput(
 		ValueError:         valueError,
 		Autofocus:          options.Autofocus,
 		DatalistOptions:    datalistOptions,
+		PackageHref:        util.GetPackageHrefWithFallback(pkg, manifest),
 	}
 }
diff --git a/internal/web/components/pkg_detail_btns/controller.go b/internal/web/components/pkg_detail_btns/controller.go
index 65483da3e..dbf33f1d2 100644
--- a/internal/web/components/pkg_detail_btns/controller.go
+++ b/internal/web/components/pkg_detail_btns/controller.go
@@ -3,6 +3,10 @@ package pkg_detail_btns
 import (
 	"fmt"
 
+	"github.com/glasskube/glasskube/internal/web/util"
+
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/pkg/client"
 )
@@ -15,7 +19,8 @@ type pkgDetailBtnsInput struct {
 	Status          *client.PackageStatus
 	Manifest        *v1alpha1.PackageManifest
 	UpdateAvailable bool
-	Pkg             *v1alpha1.ClusterPackage
+	Pkg             ctrlpkg.Package
+	PackageHref     string
 }
 
 func getId(pkgName string) string {
@@ -26,7 +31,7 @@ func ForPkgDetailBtns(
 	pkgName string,
 	status *client.PackageStatus,
 	manifest *v1alpha1.PackageManifest,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
 	updateAvailable bool,
 ) *pkgDetailBtnsInput {
 	id := getId(pkgName)
@@ -37,5 +42,6 @@ func ForPkgDetailBtns(
 		Manifest:        manifest,
 		UpdateAvailable: updateAvailable,
 		Pkg:             pkg,
+		PackageHref:     util.GetPackageHref(pkg, manifest),
 	}
 }
diff --git a/internal/web/components/pkg_overview_btn/controller.go b/internal/web/components/pkg_overview_btn/controller.go
index 8c76536e8..d1fbea729 100644
--- a/internal/web/components/pkg_overview_btn/controller.go
+++ b/internal/web/components/pkg_overview_btn/controller.go
@@ -3,34 +3,42 @@ package pkg_overview_btn
 import (
 	"fmt"
 
+	"github.com/glasskube/glasskube/internal/web/util"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/pkg/client"
 	"github.com/glasskube/glasskube/pkg/list"
 )
 
-const TemplateId = "pkg-overview-btn"
+const templateId = "clpkg-overview-btn"
 
-type pkgOverviewBtnInput struct {
+type clpkgOverviewBtnInput struct {
 	ButtonId        string
 	PackageName     string
 	Status          *client.PackageStatus
 	Manifest        *v1alpha1.PackageManifest
 	UpdateAvailable bool
-	Pkg             *v1alpha1.ClusterPackage
+	InDeletion      bool
+	PackageHref     string
 }
 
 func getButtonId(pkgName string) string {
-	return fmt.Sprintf("%v-%v", TemplateId, pkgName)
+	return fmt.Sprintf("%v-%v", templateId, pkgName)
 }
 
-func ForPkgOverviewBtn(packageWithStatus *list.PackageWithStatus, updateAvailable bool) *pkgOverviewBtnInput {
+func ForClPkgOverviewBtn(packageWithStatus *list.PackageWithStatus, updateAvailable bool) *clpkgOverviewBtnInput {
 	buttonId := getButtonId(packageWithStatus.Name)
-	return &pkgOverviewBtnInput{
+	inDeletion := false
+	if packageWithStatus.ClusterPackage != nil {
+		inDeletion = !packageWithStatus.ClusterPackage.DeletionTimestamp.IsZero()
+	}
+	return &clpkgOverviewBtnInput{
 		ButtonId:        buttonId,
 		PackageName:     packageWithStatus.Name,
 		Status:          packageWithStatus.Status,
 		Manifest:        packageWithStatus.InstalledManifest,
 		UpdateAvailable: updateAvailable,
-		Pkg:             packageWithStatus.Package,
+		InDeletion:      inDeletion,
+		PackageHref:     util.GetClusterPkgHref(packageWithStatus.Name),
 	}
 }
diff --git a/internal/web/components/pkg_update_alert/controller.go b/internal/web/components/pkg_update_alert/controller.go
index ea816c692..8c4481c24 100644
--- a/internal/web/components/pkg_update_alert/controller.go
+++ b/internal/web/components/pkg_update_alert/controller.go
@@ -4,8 +4,12 @@ const TemplateId = "pkg-update-alert"
 
 type pkgUpdateAlertInput struct {
 	UpdatesAvailable bool
+	PackageHref      string
 }
 
 func ForPkgUpdateAlert(data map[string]any) *pkgUpdateAlertInput {
-	return &pkgUpdateAlertInput{UpdatesAvailable: data["UpdatesAvailable"].(bool)}
+	return &pkgUpdateAlertInput{
+		UpdatesAvailable: data["UpdatesAvailable"].(bool),
+		PackageHref:      data["PackageHref"].(string),
+	}
 }
diff --git a/internal/web/configurationvalues.go b/internal/web/configurationvalues.go
index ce97eabb7..257ea1e34 100644
--- a/internal/web/configurationvalues.go
+++ b/internal/web/configurationvalues.go
@@ -100,31 +100,64 @@ func extractPackageValueSource(r *http.Request, valueName string) *v1alpha1.Pack
 	}
 }
 
-// packageConfigurationInput is a GET endpoint, which returns an html snippet containing an input container.
+// packageConfigurationInput is like clusterPackageConfigurationInput but for packages
+func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Request) {
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+	selectedVersion := r.FormValue("selectedVersion")
+	repositoryName := r.FormValue("repositoryName")
+	pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), namespace, name)
+	if err != nil && !errors.IsNotFound(err) {
+		err = fmt.Errorf("an error occurred fetching package details of %v: %w", manifestName, err)
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return
+	}
+
+	s.handleConfigurationInput(w, r, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    manifestName,
+		pkg:             pkg,
+		manifest:        manifest,
+	})
+}
+
+// clusterPackageConfigurationInput is a GET endpoint, which returns an html snippet containing an input container.
 // The endpoint requires the pkgName query parameter to be set, as well as the valueName query parameter (which holds
 // the name of the desired value according to the package value definitions).
 // An optional query parameter refKind can be passed to request the snippet in a certain variant, where the accepted
 // refKind values are: ConfigMap, Secret, Package. If no refKind is given, the "regular" input is returned.
 // In any case, the input container consists of a button where the user can change the type of reference or remove the
 // reference, and the actual input field(s).
-func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Request) {
+func (s *server) clusterPackageConfigurationInput(w http.ResponseWriter, r *http.Request) {
 	pkgName := mux.Vars(r)["pkgName"]
 	selectedVersion := r.FormValue("selectedVersion")
 	repositoryName := r.FormValue("repositoryName")
-	pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), pkgName)
+	pkg, manifest, err := describe.DescribeInstalledClusterPackage(r.Context(), pkgName)
 	if err != nil && !errors.IsNotFound(err) {
 		err = fmt.Errorf("an error occurred fetching package details of %v: %w", pkgName, err)
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		return
 	}
 
-	if manifest == nil {
-		manifest = &v1alpha1.PackageManifest{}
-		if err := s.repoClientset.ForRepoWithName(repositoryName).
-			FetchPackageManifest(pkgName, selectedVersion, manifest); err != nil {
+	s.handleConfigurationInput(w, r, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    pkgName,
+		pkg:             pkg,
+		manifest:        manifest,
+	})
+}
+
+func (s *server) handleConfigurationInput(w http.ResponseWriter, r *http.Request, d *packageDetailPageContext) {
+	if d.manifest == nil {
+		d.manifest = &v1alpha1.PackageManifest{}
+		if err := s.repoClientset.ForRepoWithName(d.repositoryName).
+			FetchPackageManifest(d.manifestName, d.selectedVersion, d.manifest); err != nil {
 			// TODO check error handling again?
 			s.respondAlertAndLog(w, err,
-				fmt.Sprintf("An error occurred fetching manifest of %v in version %v", pkgName, selectedVersion),
+				fmt.Sprintf("An error occurred fetching manifest of %v in version %v", d.manifestName, d.selectedVersion),
 				"danger")
 			return
 		}
@@ -132,7 +165,7 @@ func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Reques
 
 	valueName := mux.Vars(r)["valueName"]
 	refKind := r.URL.Query().Get("refKind")
-	if valueDefinition, ok := manifest.ValueDefinitions[valueName]; ok {
+	if valueDefinition, ok := d.manifest.ValueDefinitions[valueName]; ok {
 		options := pkg_config_input.PkgConfigInputDatalistOptions{}
 		if refKind == refKindConfigMap || refKind == refKindSecret {
 			if opts, err := s.getNamespaceOptions(); err != nil {
@@ -148,13 +181,13 @@ func (s *server) packageConfigurationInput(w http.ResponseWriter, r *http.Reques
 			}
 		}
 		input := pkg_config_input.ForPkgConfigInput(
-			pkg, repositoryName, selectedVersion, pkgName, valueName, valueDefinition, nil, &options,
+			d.pkg, d.repositoryName, d.selectedVersion, d.manifest, valueName, valueDefinition, nil, &options,
 			&pkg_config_input.PkgConfigInputRenderOptions{
 				Autofocus:      true,
 				DesiredRefKind: &refKind,
 			})
-		err = s.templates.pkgConfigInput.Execute(w, input)
-		checkTmplError(err, fmt.Sprintf("package config input (%s, %s)", pkgName, valueName))
+		err := s.templates.pkgConfigInput.Execute(w, input)
+		checkTmplError(err, fmt.Sprintf("package config input (%s, %s)", d.manifestName, valueName))
 	}
 }
 
diff --git a/internal/web/discussions.go b/internal/web/discussions.go
index 791f38fa2..ea3d7d00d 100644
--- a/internal/web/discussions.go
+++ b/internal/web/discussions.go
@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/glasskube/glasskube/internal/web/util"
+
 	"github.com/glasskube/glasskube/internal/giscus"
 	"github.com/glasskube/glasskube/internal/httperror"
 
@@ -20,53 +22,96 @@ import (
 // packageDiscussion is a full page for showing various discussions, reactions, etc.
 func (s *server) packageDiscussion(w http.ResponseWriter, r *http.Request) {
 	if r.Method == http.MethodPost {
-		githubUrl := r.FormValue("githubUrl")
-		telemetry.SetUserProperty("github_url", githubUrl)
+		s.handleGiscus(r)
+		return
+	}
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+	repositoryName := mux.Vars(r)["repositoryName"]
+	pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), namespace, name)
+	if err != nil && !errors.IsNotFound(err) {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("An error occurred fetching installed package %v", name), "danger")
+		return
+	}
+
+	s.handlePackageDiscussionPage(w, r, &packageDetailPageContext{
+		repositoryName: repositoryName,
+		manifestName:   manifestName,
+		pkg:            pkg,
+		manifest:       manifest,
+	})
+
+}
+
+// clusterPackageDiscussion is a full page for showing various discussions, reactions, etc.
+func (s *server) clusterPackageDiscussion(w http.ResponseWriter, r *http.Request) {
+	if r.Method == http.MethodPost {
+		s.handleGiscus(r)
 		return
 	}
 	pkgName := mux.Vars(r)["pkgName"]
 	repositoryName := mux.Vars(r)["repositoryName"]
-	pkg, manifest, err := describe.DescribeInstalledPackage(r.Context(), pkgName)
+	pkg, manifest, err := describe.DescribeInstalledClusterPackage(r.Context(), pkgName)
 	if err != nil && !errors.IsNotFound(err) {
 		s.respondAlertAndLog(w, err,
 			fmt.Sprintf("An error occurred fetching installed package %v", pkgName), "danger")
 		return
-	} else if err != nil {
-		// implies that the package is not installed
-		err = nil
 	}
 
+	s.handlePackageDiscussionPage(w, r, &packageDetailPageContext{
+		repositoryName: repositoryName,
+		manifestName:   pkgName,
+		pkg:            pkg,
+		manifest:       manifest,
+	})
+}
+
+func (s *server) handleGiscus(r *http.Request) {
+	githubUrl := r.FormValue("githubUrl")
+	telemetry.SetUserProperty("github_url", githubUrl)
+}
+
+func (s *server) handlePackageDiscussionPage(w http.ResponseWriter, r *http.Request, d *packageDetailPageContext) {
 	var idx repo.PackageIndex
-	if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil {
-		s.respondAlertAndLog(w, err, "An error occurred fetching versions of "+pkgName, "danger")
+	if err := s.repoClientset.ForRepoWithName(d.repositoryName).FetchPackageIndex(d.manifestName, &idx); err != nil {
+		s.respondAlertAndLog(w, err, "An error occurred fetching versions of "+d.manifestName, "danger")
 		return
 	}
 
-	if manifest == nil {
-		manifest = &v1alpha1.PackageManifest{}
-		if err := s.repoClientset.ForRepoWithName(repositoryName).
-			FetchPackageManifest(pkgName, idx.LatestVersion, manifest); err != nil {
+	if d.manifest == nil {
+		d.manifest = &v1alpha1.PackageManifest{}
+		if err := s.repoClientset.ForRepoWithName(d.repositoryName).
+			FetchPackageManifest(d.manifestName, idx.LatestVersion, d.manifest); err != nil {
 			s.respondAlertAndLog(w, err,
 				fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v",
-					pkgName, idx.LatestVersion, repositoryName), "danger")
+					d.manifest, idx.LatestVersion, d.repositoryName), "danger")
 			return
 		}
 	}
 
-	err = s.templates.pkgDiscussionPageTmpl.Execute(w, s.enrichPage(r, map[string]any{
+	pkgHref := util.GetPackageHref(d.pkg, d.manifest)
+
+	err := s.templates.pkgDiscussionPageTmpl.Execute(w, s.enrichPage(r, map[string]any{
 		"Giscus":             giscus.Client().Config,
-		"Package":            pkg,
-		"Status":             client.GetStatusOrPending(pkg),
-		"Manifest":           manifest,
+		"Package":            d.pkg,
+		"Status":             client.GetStatusOrPending(d.pkg),
+		"Manifest":           d.manifest,
 		"LatestVersion":      idx.LatestVersion,
-		"UpdateAvailable":    pkg != nil && s.isUpdateAvailable(r.Context(), pkgName),
+		"UpdateAvailable":    s.isUpdateAvailableForPkg(r.Context(), d.pkg),
 		"ShowDiscussionLink": true,
-	}, err))
-	checkTmplError(err, fmt.Sprintf("package-detail (%s)", pkgName))
+		"PackageHref":        pkgHref,
+		"DiscussionHref":     fmt.Sprintf("%s/discussion", pkgHref),
+	}, nil))
+	checkTmplError(err, fmt.Sprintf("package-discussion (%s)", d.manifestName))
 }
 
 func (s *server) discussionBadge(w http.ResponseWriter, r *http.Request) {
 	pkgName := mux.Vars(r)["pkgName"]
+	if pkgName == "" {
+		pkgName = mux.Vars(r)["manifestName"]
+	}
 
 	var totalCount int
 	if counts, err := giscus.Client().GetCountsFor(pkgName); err != nil {
diff --git a/internal/web/packagedetail.go b/internal/web/packagedetail.go
new file mode 100644
index 000000000..a0cfe694b
--- /dev/null
+++ b/internal/web/packagedetail.go
@@ -0,0 +1,217 @@
+package web
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"slices"
+
+	webutil "github.com/glasskube/glasskube/internal/web/util"
+
+	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/clientutils"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+	"github.com/glasskube/glasskube/internal/dependency"
+	"github.com/glasskube/glasskube/internal/repo"
+	"github.com/glasskube/glasskube/internal/repo/types"
+	"github.com/glasskube/glasskube/internal/util"
+	"github.com/glasskube/glasskube/internal/web/components/pkg_config_input"
+	"github.com/glasskube/glasskube/pkg/client"
+	"github.com/glasskube/glasskube/pkg/describe"
+	"github.com/gorilla/mux"
+	"k8s.io/apimachinery/pkg/api/errors"
+)
+
+type packageDetailPageContext struct {
+	repositoryName  string
+	selectedVersion string
+	manifestName    string
+	pkg             ctrlpkg.Package
+	manifest        *v1alpha1.PackageManifest
+}
+
+func (s *server) packageDetail(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+	repositoryName := r.FormValue("repositoryName")
+	selectedVersion := r.FormValue("selectedVersion")
+
+	var pkg *v1alpha1.Package
+	var manifest *v1alpha1.PackageManifest
+	if namespace != "" && name != "" && namespace != "-" && name != "-" {
+		var err error
+		pkg, manifest, err = describe.DescribeInstalledPackage(ctx, namespace, name)
+		if err != nil && !errors.IsNotFound(err) {
+			s.respondAlertAndLog(w, err,
+				fmt.Sprintf("An error occurred fetching package details of installed package %v in namespace %v", name, namespace),
+				"danger")
+			return
+		} else if errors.IsNotFound(err) {
+			s.swappingRedirect(w, "/packages", "main", "main")
+			w.WriteHeader(http.StatusNotFound)
+			return
+		} else if pkg != nil {
+			repositoryName = pkg.Spec.PackageInfo.RepositoryName
+		}
+	}
+
+	s.handlePackageDetailPage(ctx, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    manifestName,
+		pkg:             pkg,
+		manifest:        manifest,
+	}, r, w)
+}
+
+func (s *server) clusterPackageDetail(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	pkgName := mux.Vars(r)["pkgName"]
+	repositoryName := r.FormValue("repositoryName")
+	selectedVersion := r.FormValue("selectedVersion")
+
+	pkg, manifest, err := describe.DescribeInstalledClusterPackage(ctx, pkgName)
+	if err != nil && !errors.IsNotFound(err) {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName),
+			"danger")
+		return
+	} else if pkg != nil {
+		repositoryName = pkg.Spec.PackageInfo.RepositoryName
+	}
+
+	s.handlePackageDetailPage(ctx, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    pkgName,
+		pkg:             pkg,
+		manifest:        manifest,
+	}, r, w)
+}
+
+func (s *server) handlePackageDetailPage(ctx context.Context, d *packageDetailPageContext, r *http.Request, w http.ResponseWriter) {
+	var err error
+	var repos []v1alpha1.PackageRepository
+	var usedRepo *v1alpha1.PackageRepository
+	if d.repositoryName, repos, usedRepo, err = s.getRepos(
+		ctx, d.manifestName, d.repositoryName); err != nil {
+		s.respondAlertAndLog(w, err, "", "danger")
+		return
+	}
+
+	var idx repo.PackageIndex
+	var latestVersion string
+	if idx, latestVersion, d.selectedVersion, err = s.getVersions(
+		d.repositoryName, d.manifestName, d.selectedVersion); err != nil {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("An error occurred fetching package index of %v in repository %v", d.manifestName, d.repositoryName),
+			"danger")
+		return
+	}
+
+	if d.manifest == nil {
+		d.manifest = &v1alpha1.PackageManifest{}
+		if err := s.repoClientset.ForRepoWithName(d.repositoryName).
+			FetchPackageManifest(d.manifestName, d.selectedVersion, d.manifest); err != nil {
+			s.respondAlertAndLog(w, err,
+				fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v",
+					d.manifestName, d.selectedVersion, d.repositoryName),
+				"danger")
+			return
+		}
+	}
+
+	res, err := s.dependencyMgr.Validate(r.Context(), d.manifest, d.selectedVersion)
+	if err != nil {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("An error occurred validating dependencies of %v in version %v", d.manifestName, d.selectedVersion),
+			"danger")
+		return
+	}
+
+	valueErrors := make(map[string]error)
+	datalistOptions := make(map[string]*pkg_config_input.PkgConfigInputDatalistOptions)
+	if !d.pkg.IsNil() {
+		nsOptions, _ := s.getNamespaceOptions()
+		pkgsOptions, _ := s.getPackagesOptions(r.Context())
+		for key, v := range d.pkg.GetSpec().Values {
+			if _, err := s.valueResolver.ResolveValue(r.Context(), v); err != nil {
+				valueErrors[key] = util.GetRootCause(err)
+			}
+			if v.ValueFrom != nil {
+				options, err := s.getDatalistOptions(r.Context(), v.ValueFrom, nsOptions, pkgsOptions)
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "%v\n", err)
+				}
+				datalistOptions[key] = options
+			}
+		}
+	}
+
+	err = s.templates.pkgPageTmpl.Execute(w, s.enrichPage(r, map[string]any{
+		"Package":            d.pkg,
+		"Status":             client.GetStatusOrPending(d.pkg),
+		"Manifest":           d.manifest,
+		"LatestVersion":      latestVersion,
+		"UpdateAvailable":    s.isUpdateAvailableForPkg(r.Context(), d.pkg),
+		"AutoUpdate":         clientutils.AutoUpdateString(d.pkg, "Disabled"),
+		"ValidationResult":   res,
+		"ShowConflicts":      res.Status == dependency.ValidationResultStatusConflict,
+		"SelectedVersion":    d.selectedVersion,
+		"PackageIndex":       &idx,
+		"Repositories":       repos,
+		"RepositoryName":     d.repositoryName,
+		"ShowConfiguration":  (!d.pkg.IsNil() && len(d.manifest.ValueDefinitions) > 0 && d.pkg.GetDeletionTimestamp().IsZero()) || d.pkg.IsNil(),
+		"ValueErrors":        valueErrors,
+		"DatalistOptions":    datalistOptions,
+		"ShowDiscussionLink": usedRepo.IsGlasskubeRepo(),
+		"PackageHref":        webutil.GetPackageHrefWithFallback(d.pkg, d.manifest),
+	}, err))
+	checkTmplError(err, fmt.Sprintf("package-detail (%s)", d.manifestName))
+}
+
+func (s *server) getVersions(repositoryName string, pkgName string, selectedVersion string) (repo.PackageIndex, string, string, error) {
+	var idx repo.PackageIndex
+	if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil {
+		return repo.PackageIndex{}, "", "", err
+	}
+	latestVersion := idx.LatestVersion
+
+	if selectedVersion == "" {
+		selectedVersion = latestVersion
+	} else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool {
+		return item.Version == selectedVersion
+	}) {
+		selectedVersion = latestVersion
+	}
+	return idx, latestVersion, selectedVersion, nil
+}
+
+func (s *server) getRepos(ctx context.Context, manifestName string, repositoryName string) (
+	string, []v1alpha1.PackageRepository, *v1alpha1.PackageRepository, error) {
+	var repos []v1alpha1.PackageRepository
+	var err error
+	if repos, err = s.repoClientset.Meta().GetReposForPackage(manifestName); err != nil {
+		fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err)
+	} else if repositoryName == "" {
+		if len(repos) == 0 {
+			return "", nil, nil, fmt.Errorf("%v not found in any repository", manifestName)
+		}
+		for _, r := range repos {
+			repositoryName = r.Name
+			if r.IsDefaultRepository() {
+				break
+			}
+		}
+	}
+
+	var usedRepo v1alpha1.PackageRepository
+	if err := s.pkgClient.PackageRepositories().Get(ctx, repositoryName, &usedRepo); err != nil {
+		return "", nil, nil, err
+	}
+
+	return repositoryName, repos, &usedRepo, nil
+}
diff --git a/internal/web/response.go b/internal/web/response.go
new file mode 100644
index 000000000..e7648b4ff
--- /dev/null
+++ b/internal/web/response.go
@@ -0,0 +1,50 @@
+package web
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+)
+
+func (s *server) respondSuccess(w http.ResponseWriter) {
+	err := s.templates.alertTmpl.Execute(w, map[string]any{
+		"Message":     "Configuration updated successfully",
+		"Dismissible": true,
+		"Type":        "success",
+	})
+	checkTmplError(err, "success")
+}
+
+func (s *server) respondAlertAndLog(w http.ResponseWriter, err error, wrappingMsg string, alertType string) {
+	if wrappingMsg != "" {
+		err = fmt.Errorf("%v: %w", wrappingMsg, err)
+	}
+	fmt.Fprintf(os.Stderr, "%v\n", err)
+	s.respondAlert(w, err.Error(), alertType)
+}
+
+func (s *server) respondAlert(w http.ResponseWriter, message string, alertType string) {
+	w.Header().Add("Hx-Reselect", "div.alert") // overwrite any existing hx-select (which was a little intransparent sometimes)
+	w.Header().Add("Hx-Reswap", "afterbegin")
+	w.WriteHeader(http.StatusBadRequest)
+	err := s.templates.alertTmpl.Execute(w, map[string]any{
+		"Message":     message,
+		"Dismissible": true,
+		"Type":        alertType,
+	})
+	checkTmplError(err, "alert")
+}
+
+// swappingRedirect adds the Hx-Location header to the response, which, when interpreted by htmx.js, will make
+// the frontend redirect to the given path and swap the given target with the given slect from the response
+// also see: https://htmx.org/headers/hx-location/
+func (s *server) swappingRedirect(w http.ResponseWriter, path string, target string, slect string) {
+	locationData := map[string]string{
+		"path":   path,
+		"target": target,
+		"select": slect,
+	}
+	locationJson, _ := json.Marshal(locationData)
+	w.Header().Add("Hx-Location", string(locationJson))
+}
diff --git a/internal/web/server.go b/internal/web/server.go
index fccad1923..687214cad 100644
--- a/internal/web/server.go
+++ b/internal/web/server.go
@@ -18,6 +18,10 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
+	"github.com/glasskube/glasskube/internal/web/util"
+
 	"github.com/Masterminds/semver/v3"
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	clientadapter "github.com/glasskube/glasskube/internal/adapter/goclient"
@@ -28,10 +32,8 @@ import (
 	"github.com/glasskube/glasskube/internal/manifestvalues"
 	"github.com/glasskube/glasskube/internal/repo"
 	repoclient "github.com/glasskube/glasskube/internal/repo/client"
-	"github.com/glasskube/glasskube/internal/repo/types"
+	repotypes "github.com/glasskube/glasskube/internal/repo/types"
 	"github.com/glasskube/glasskube/internal/telemetry"
-	"github.com/glasskube/glasskube/internal/util"
-	"github.com/glasskube/glasskube/internal/web/components/pkg_config_input"
 	"github.com/glasskube/glasskube/internal/web/handler"
 	"github.com/glasskube/glasskube/pkg/bootstrap"
 	"github.com/glasskube/glasskube/pkg/client"
@@ -174,23 +176,49 @@ func (s *server) Start(ctx context.Context) error {
 	router.HandleFunc("/kubeconfig", s.kubeconfigPage)
 	router.Handle("/bootstrap", s.requireKubeconfig(s.bootstrapPage))
 	router.Handle("/kubeconfig/persist", s.requireKubeconfig(s.persistKubeconfig))
+	// overview pages
 	router.Handle("/packages", s.requireReady(s.packages))
-	router.Handle("/packages/update", s.requireReady(s.update))
-	router.Handle("/packages/update/modal", s.requireReady(s.updateModal))
-	router.Handle("/packages/uninstall", s.requireReady(s.uninstall))
-	router.Handle("/packages/uninstall/modal", s.requireReady(s.uninstallModal))
-	router.Handle("/packages/open", s.requireReady(s.open))
-	router.Handle("/packages/{pkgName}", s.requireReady(s.packageDetail))
-	router.Handle("/packages/{pkgName}/discussion", s.requireReady(s.packageDiscussion))
-	router.Handle("/packages/{pkgName}/discussion/badge", s.requireReady(s.discussionBadge))
-	router.Handle("/packages/{pkgName}/configure", s.requireReady(s.installOrConfigurePackage))
-	router.Handle("/packages/{pkgName}/configure/advanced", s.requireReady(s.advancedConfiguration))
-	router.Handle("/packages/{pkgName}/configuration/{valueName}", s.requireReady(s.packageConfigurationInput))
-	router.Handle("/packages/{pkgName}/configuration/{valueName}/datalists/names", s.requireReady(s.namesDatalist))
-	router.Handle("/packages/{pkgName}/configuration/{valueName}/datalists/keys", s.requireReady(s.keysDatalist))
+	router.Handle("/clusterpackages", s.requireReady(s.clusterPackages))
+
+	// detail page endpoints
+	pkgBasePath := "/packages/{manifestName}"
+	installedPkgBasePath := pkgBasePath + "/{namespace}/{name}"
+	clpkgBasePath := "/clusterpackages/{pkgName}"
+	router.Handle(pkgBasePath, s.requireReady(s.packageDetail))
+	router.Handle(installedPkgBasePath, s.requireReady(s.packageDetail))
+	router.Handle(clpkgBasePath, s.requireReady(s.clusterPackageDetail))
+	// discussion endpoints
+	router.Handle(pkgBasePath+"/discussion", s.requireReady(s.packageDiscussion))
+	router.Handle(installedPkgBasePath+"/discussion", s.requireReady(s.packageDiscussion))
+	router.Handle(clpkgBasePath+"/discussion", s.requireReady(s.clusterPackageDiscussion))
+	router.Handle(pkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge))
+	router.Handle(installedPkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge))
+	router.Handle(clpkgBasePath+"/discussion/badge", s.requireReady(s.discussionBadge))
+	// configuration endpoints
+	router.Handle(installedPkgBasePath+"/configure", s.requireReady(s.installOrConfigurePackage))
+	router.Handle(clpkgBasePath+"/configure", s.requireReady(s.installOrConfigureClusterPackage))
+	router.Handle(installedPkgBasePath+"/configure/advanced", s.requireReady(s.advancedPackageConfiguration))
+	router.Handle(clpkgBasePath+"/configure/advanced", s.requireReady(s.advancedClusterPackageConfiguration))
+	router.Handle(pkgBasePath+"/configuration/{valueName}", s.requireReady(s.packageConfigurationInput))
+	router.Handle(installedPkgBasePath+"/configuration/{valueName}", s.requireReady(s.packageConfigurationInput))
+	router.Handle(clpkgBasePath+"/configuration/{valueName}", s.requireReady(s.clusterPackageConfigurationInput))
+	// update endpoints
+	router.Handle(installedPkgBasePath+"/update", s.requireReady(s.update))
+	router.Handle(clpkgBasePath+"/update", s.requireReady(s.update))
+	// open endpoints
+	router.Handle(installedPkgBasePath+"/open", s.requireReady(s.open))
+	router.Handle(clpkgBasePath+"/open", s.requireReady(s.open))
+	// uninstall endpoints
+	router.Handle(installedPkgBasePath+"/uninstall", s.requireReady(s.uninstall))
+	router.Handle(clpkgBasePath+"/uninstall", s.requireReady(s.uninstall))
+
+	// configuration datalist endpoints
+	router.Handle("/datalists/{valueName}/names", s.requireReady(s.namesDatalist))
+	router.Handle("/datalists/{valueName}/keys", s.requireReady(s.keysDatalist))
+	// settings
 	router.Handle("/settings", s.requireReady(s.settingsPage))
 	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/packages", http.StatusFound)
+		http.Redirect(w, r, "/clusterpackages", http.StatusFound)
 	})
 	http.Handle("/", s.enrichContext(router))
 
@@ -232,351 +260,388 @@ func (s *server) Start(ctx context.Context) error {
 	return nil
 }
 
-func (s *server) updateModal(w http.ResponseWriter, r *http.Request) {
+// uninstall is an endpoint, which returns the modal html for GET requests, and performs the update for POST
+func (s *server) update(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	pkgName := r.FormValue("packageName")
-	pkgs := make([]string, 0, 1)
-	if pkgName != "" {
-		pkgs = append(pkgs, pkgName)
-	}
+	pkgName := mux.Vars(r)["pkgName"]
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
 
-	updates := make([]map[string]any, 0)
-	updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr())
-	ut, err := updater.Prepare(ctx, pkgs)
-	if err != nil {
-		s.respondAlertAndLog(w, err, "An error occurred preparing update of "+pkgName, "danger")
-		return
-	}
-	utId := rand.Int()
-	s.updateMutex.Lock()
-	s.updateTransactions[utId] = *ut
-	s.updateMutex.Unlock()
+	if r.Method == http.MethodPost {
+		updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr())
+		s.updateMutex.Lock()
+		defer s.updateMutex.Unlock()
+		utIdStr := r.FormValue("updateTransactionId")
+		if utId, err := strconv.Atoi(utIdStr); err != nil {
+			s.respondAlertAndLog(w, err, "Failed to parse updateTransactionId", "danger")
+			return
+		} else if ut, ok := s.updateTransactions[utId]; !ok {
+			s.respondAlert(w, fmt.Sprintf("Failed to find UpdateTransaction with ID %d", utId), "danger")
+			return
+		} else if _, err := updater.Apply(ctx, &ut); err != nil {
+			delete(s.updateTransactions, utId)
+			s.respondAlertAndLog(w, err, "An error occurred during the update", "danger")
+			return
+		} else {
+			delete(s.updateTransactions, utId)
+		}
+	} else {
+		packageHref := ""
+		updates := make([]map[string]any, 0)
+		updateGetters := make([]update.PackagesGetter, 0, 1)
+		if pkgName != "" {
+			packageHref = "/clusterpackages/" + pkgName
+			// update concerns cluster packages
+			if pkgName == "-" {
+				// prepare updates for all installed packages
+				updateGetters = append(updateGetters, update.GetAllClusterPackages())
+			} else {
+				// prepare update for a specific package
+				updateGetters = append(updateGetters, update.GetClusterPackageWithName(pkgName))
+			}
+		} else {
+			// update concerns namespaced packages
+			packageHref = util.GetNamespacedPkgHref(manifestName, namespace, name)
+			if manifestName == "-" {
+				// prepare updates for all installed namespaced packages
+				updateGetters = append(updateGetters, update.GetAllPackages(""))
+			} else {
+				// prepare update for a specific namespaced package
+				updateGetters = append(updateGetters, update.GetPackageWithName(namespace, name))
+			}
+		}
 
-	for _, u := range ut.Items {
-		if u.UpdateRequired() {
+		updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr())
+		updateTx, err := updater.Prepare(ctx, updateGetters...)
+		if err != nil {
+			s.respondAlertAndLog(w, err, "An error occurred preparing update of "+pkgName, "danger")
+			return
+		}
+		utId := rand.Int()
+		s.updateMutex.Lock()
+		s.updateTransactions[utId] = *updateTx
+		s.updateMutex.Unlock()
+
+		for _, u := range updateTx.Items {
+			if u.UpdateRequired() {
+				updates = append(updates, map[string]any{
+					"Package":        u.Package,
+					"CurrentVersion": u.Package.GetSpec().PackageInfo.Version,
+					"LatestVersion":  u.Version,
+				})
+			}
+		}
+		for _, req := range updateTx.Requirements {
 			updates = append(updates, map[string]any{
-				"Name":           u.Package.Name,
-				"CurrentVersion": u.Package.Spec.PackageInfo.Version,
-				"LatestVersion":  u.Version,
+				"Package":        req,
+				"CurrentVersion": "-",
+				"LatestVersion":  req.Version,
 			})
 		}
-	}
-	for _, req := range ut.Requirements {
-		updates = append(updates, map[string]any{
-			"Name":           req.Name,
-			"CurrentVersion": "-",
-			"LatestVersion":  req.Version,
+
+		err = s.templates.pkgUpdateModalTmpl.Execute(w, map[string]any{
+			"UpdateTransactionId": utId,
+			"Updates":             updates,
+			"PackageHref":         packageHref,
 		})
+		checkTmplError(err, "pkgUpdateModalTmpl")
 	}
-
-	err = s.templates.pkgUpdateModalTmpl.Execute(w, map[string]any{
-		"UpdateTransactionId": utId,
-		"Updates":             updates,
-		"PackageName":         pkgName,
-	})
-	checkTmplError(err, "pkgUpdateModalTmpl")
 }
 
-func (s *server) update(w http.ResponseWriter, r *http.Request) {
+// uninstall is an endpoint, which returns the modal html for GET requests, and performs the uninstallation for POST
+func (s *server) uninstall(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	updater := update.NewUpdater(ctx).WithStatusWriter(statuswriter.Stderr())
-	s.updateMutex.Lock()
-	defer s.updateMutex.Unlock()
-	utIdStr := r.FormValue("updateTransactionId")
-	if utId, err := strconv.Atoi(utIdStr); err != nil {
-		s.respondAlertAndLog(w, err, "Failed to parse updateTransactionId", "danger")
-		return
-	} else if ut, ok := s.updateTransactions[utId]; !ok {
-		s.respondAlert(w, fmt.Sprintf("Failed to find UpdateTransaction with ID %d", utId), "danger")
-		return
-	} else if _, err := updater.Apply(ctx, &ut); err != nil {
-		delete(s.updateTransactions, utId)
-		s.respondAlertAndLog(w, err, "An error occurred during the update", "danger")
-		return
-	} else {
-		delete(s.updateTransactions, utId)
-	}
-}
+	pkgName := mux.Vars(r)["pkgName"]
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
 
-func (s *server) uninstallModal(w http.ResponseWriter, r *http.Request) {
-	pkgName := r.FormValue("packageName")
-	var pruned []string
-	var err error
-	if g, err1 := s.dependencyMgr.NewGraph(r.Context()); err1 != nil {
-		err = fmt.Errorf("error validating uninstall: %w", err1)
+	if r.Method == http.MethodPost {
+		uninstaller := uninstall.NewUninstaller(s.pkgClient).WithStatusWriter(statuswriter.Stderr())
+		if pkgName != "" {
+			var pkg v1alpha1.ClusterPackage
+			if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil {
+				s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", pkgName), "danger")
+				return
+			}
+			if err := uninstaller.Uninstall(ctx, &pkg); err != nil {
+				s.respondAlertAndLog(w, err, "An error occurred uninstalling "+pkgName, "danger")
+				return
+			}
+		} else {
+			var pkg v1alpha1.Package
+			if err := s.pkgClient.Packages(namespace).Get(ctx, name, &pkg); err != nil {
+				s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", name), "danger")
+				return
+			}
+			if err := uninstaller.Uninstall(ctx, &pkg); err != nil {
+				s.respondAlertAndLog(w, err, "An error occurred uninstalling "+name, "danger")
+				return
+			}
+		}
 	} else {
-		g.Delete(pkgName)
-		pruned = g.Prune()
-		if err1 := g.Validate(); err1 != nil {
-			err = fmt.Errorf("%v cannot be uninstalled: %w", pkgName, err1)
+		if pkgName != "" {
+			var pruned []string
+			var err error
+			// dependency checks are only necessary for clusterpackages, as there are no dependencies on namespaced packages
+			if g, err1 := s.dependencyMgr.NewGraph(r.Context()); err1 != nil {
+				err = fmt.Errorf("error validating uninstall: %w", err1)
+			} else {
+				g.Delete(pkgName)
+				pruned = g.Prune()
+				if err1 := g.Validate(); err1 != nil {
+					err = fmt.Errorf("%v cannot be uninstalled: %w", pkgName, err1)
+				}
+			}
+			err = s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{
+				"PackageName": pkgName,
+				"Pruned":      pruned,
+				"Err":         err,
+				"PackageHref": util.GetClusterPkgHref(pkgName),
+			})
+			checkTmplError(err, "pkgUninstallModalTmpl")
+		} else {
+			err := s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{
+				"Namespace":   namespace,
+				"Name":        name,
+				"PackageHref": util.GetNamespacedPkgHref(manifestName, namespace, name),
+			})
+			checkTmplError(err, "pkgUninstallModalTmpl")
 		}
 	}
-	err = s.templates.pkgUninstallModalTmpl.Execute(w, map[string]any{
-		"PackageName": pkgName,
-		"Pruned":      pruned,
-		"Err":         err,
-	})
-	checkTmplError(err, "pkgUninstallModalTmpl")
 }
 
-func (s *server) uninstall(w http.ResponseWriter, r *http.Request) {
+func (s *server) open(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	pkgName := r.FormValue("packageName")
-	var pkg v1alpha1.ClusterPackage
-	if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil {
-		s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching %v during uninstall", pkgName), "danger")
-		return
-	}
-	if err := uninstall.NewUninstaller(s.pkgClient).
-		WithStatusWriter(statuswriter.Stderr()).
-		Uninstall(ctx, &pkg); err != nil {
-		s.respondAlertAndLog(w, err, "An error occurred uninstalling "+pkgName, "danger")
-		return
+	pkgName := mux.Vars(r)["pkgName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+
+	if pkgName != "" {
+		var pkg v1alpha1.ClusterPackage
+		if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil {
+			s.respondAlertAndLog(w, err, "Could not get ClusterPackage", "danger")
+			return
+		}
+		s.handleOpen(ctx, w, &pkg)
+	} else {
+		var pkg v1alpha1.Package
+		if err := s.pkgClient.Packages(namespace).Get(ctx, name, &pkg); err != nil {
+			s.respondAlertAndLog(w, err, "Could not get Package", "danger")
+			return
+		}
+		s.handleOpen(ctx, w, &pkg)
 	}
 }
 
-func (s *server) open(w http.ResponseWriter, r *http.Request) {
-	pkgName := r.FormValue("packageName")
-	if result, ok := s.forwarders[pkgName]; ok {
+func (s *server) handleOpen(ctx context.Context, w http.ResponseWriter, pkg ctrlpkg.Package) {
+	fwName := cache.NewObjectName(pkg.GetNamespace(), pkg.GetName()).String()
+	if result, ok := s.forwarders[fwName]; ok {
 		result.WaitReady()
 		_ = cliutils.OpenInBrowser(result.Url)
 		return
 	}
 
-	var pkg v1alpha1.ClusterPackage
-	if err := s.pkgClient.ClusterPackages().Get(r.Context(), pkgName, &pkg); err != nil {
-		s.respondAlertAndLog(w, err, "Could not get ClusterPackage", "danger")
-		return
-	}
-
-	result, err := open.NewOpener().Open(r.Context(), &pkg, "", 0)
+	result, err := open.NewOpener().Open(ctx, pkg, "", 0)
 	if err != nil {
-		s.respondAlertAndLog(w, err, "Could not open "+pkgName, "danger")
+		s.respondAlertAndLog(w, err, "Could not open "+pkg.GetName(), "danger")
 	} else {
-		s.forwarders[pkgName] = result
+		s.forwarders[fwName] = result
 		result.WaitReady()
 		_ = cliutils.OpenInBrowser(result.Url)
 		w.WriteHeader(http.StatusAccepted)
 	}
 }
 
+func (s *server) clusterPackages(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	clpkgs, listErr := list.NewLister(ctx).GetClusterPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true})
+	if listErr != nil && len(clpkgs) == 0 {
+		listErr = fmt.Errorf("could not load clusterpackages: %w", listErr)
+		fmt.Fprintf(os.Stderr, "%v\n", listErr)
+	}
+
+	// Call isUpdateAvailable for each installed clusterpackage.
+	// This is not the same as getting all updates in a single transaction, because some dependency
+	// conflicts could be resolvable by installing individual clpkgs.
+	installedClpkgs := make([]ctrlpkg.Package, 0, len(clpkgs))
+	clpkgUpdateAvailable := map[string]bool{}
+	for _, pkg := range clpkgs {
+		if pkg.ClusterPackage != nil {
+			installedClpkgs = append(installedClpkgs, pkg.ClusterPackage)
+		}
+		clpkgUpdateAvailable[pkg.Name] = s.isUpdateAvailableForPkg(r.Context(), pkg.ClusterPackage)
+	}
+
+	overallUpdatesAvailable := false
+	if len(installedClpkgs) > 0 {
+		overallUpdatesAvailable = s.isUpdateAvailable(r.Context(), installedClpkgs)
+	}
+
+	tmplErr := s.templates.clusterPkgsPageTemplate.Execute(w, s.enrichPage(r, map[string]any{
+		"ClusterPackages":               clpkgs,
+		"ClusterPackageUpdateAvailable": clpkgUpdateAvailable,
+		"UpdatesAvailable":              overallUpdatesAvailable,
+		"PackageHref":                   util.GetClusterPkgHref("-"),
+	}, listErr))
+	checkTmplError(tmplErr, "clusterpackages")
+}
+
 func (s *server) packages(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	packages, listErr := list.NewLister(ctx).GetPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true})
-	if listErr != nil && len(packages) == 0 {
+	allPkgs, listErr := list.NewLister(ctx).GetPackagesWithStatus(ctx, list.ListOptions{IncludePackageInfos: true})
+	if listErr != nil {
 		listErr = fmt.Errorf("could not load packages: %w", listErr)
 		fmt.Fprintf(os.Stderr, "%v\n", listErr)
+		// TODO check again
 	}
 
-	// Call isUpdateAvailable for each installed package.
-	// This is not the same as getting all updates in a single transaction, because some dependency
-	// conflicts could be resolvable by installing individual packages.
 	packageUpdateAvailable := map[string]bool{}
-	for _, pkg := range packages {
-		packageUpdateAvailable[pkg.Name] = pkg.Package != nil && s.isUpdateAvailable(r.Context(), pkg.Name)
+	var installed []*list.PackagesWithStatus
+	var available []*list.PackagesWithStatus
+	var installedPkgs []ctrlpkg.Package
+	for _, pkgsWithStatus := range allPkgs {
+		if len(pkgsWithStatus.Packages) > 0 {
+			for _, pkgWithStatus := range pkgsWithStatus.Packages {
+				installedPkgs = append(installedPkgs, pkgWithStatus.Package)
+
+				// Call isUpdateAvailable for each installed package.
+				// This is not the same as getting all updates in a single transaction, because some dependency
+				// conflicts could be resolvable by installing individual packages.
+				packageUpdateAvailable[cache.MetaObjectToName(pkgWithStatus.Package).String()] =
+					s.isUpdateAvailableForPkg(ctx, pkgWithStatus.Package)
+			}
+			installed = append(installed, pkgsWithStatus)
+		} else {
+			available = append(available, pkgsWithStatus)
+		}
+	}
+
+	overallUpdatesAvailable := false
+	if len(installedPkgs) > 0 {
+		overallUpdatesAvailable = s.isUpdateAvailable(r.Context(), installedPkgs)
 	}
 
 	tmplErr := s.templates.pkgsPageTmpl.Execute(w, s.enrichPage(r, map[string]any{
-		"Packages":               packages,
+		"InstalledPackages":      installed,
+		"AvailablePackages":      available,
 		"PackageUpdateAvailable": packageUpdateAvailable,
-		"UpdatesAvailable":       s.isUpdateAvailable(r.Context()),
+		"UpdatesAvailable":       overallUpdatesAvailable,
+		"PackageHref":            util.GetNamespacedPkgHref("-", "-", "-"),
 	}, listErr))
 	checkTmplError(tmplErr, "packages")
 }
 
-func (s *server) packageDetail(w http.ResponseWriter, r *http.Request) {
+// installOrConfigurePackage is like installOrConfigureClusterPackage but for packages
+func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	pkgName := mux.Vars(r)["pkgName"]
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+	requestedNamespace := r.FormValue("requestedNamespace")
+	requestedName := r.FormValue("requestedName")
 	repositoryName := r.FormValue("repositoryName")
 	selectedVersion := r.FormValue("selectedVersion")
+	enableAutoUpdate := r.FormValue("enableAutoUpdate")
 
-	pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName)
-	if err != nil && !apierrors.IsNotFound(err) {
-		s.respondAlertAndLog(w, err,
-			fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName),
-			"danger")
+	var err error
+	pkg := &v1alpha1.Package{}
+	var mf *v1alpha1.PackageManifest
+	if err := s.pkgClient.Packages(namespace).Get(ctx, name, pkg); err != nil && !apierrors.IsNotFound(err) {
+		s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", name), "danger")
 		return
-	} else if pkg != nil {
-		repositoryName = pkg.Spec.PackageInfo.RepositoryName
-	}
-
-	var repos []v1alpha1.PackageRepository
-	if repos, err = s.repoClientset.Meta().GetReposForPackage(pkgName); err != nil {
-		fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err)
-	} else if repositoryName == "" {
-		if len(repos) == 0 {
-			s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", pkgName), "", "danger")
-			return
-		}
-		for _, r := range repos {
-			repositoryName = r.Name
-			if r.IsDefaultRepository() {
-				break
-			}
-		}
+	} else if err != nil {
+		pkg = nil
 	}
 
-	var usedRepo v1alpha1.PackageRepository
-	if err := s.pkgClient.PackageRepositories().Get(r.Context(), repositoryName, &usedRepo); err != nil {
-		s.respondAlertAndLog(w, err,
-			fmt.Sprintf("An error occurred fetching repository %v", repositoryName),
-			"danger")
+	repositoryName, mf, err = s.getUsedRepoAndManifest(ctx, pkg, repositoryName, manifestName, selectedVersion)
+	if err != nil {
+		s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred getting manifest and repo for %s", manifestName), "danger")
 		return
 	}
 
-	var idx repo.PackageIndex
-	if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil {
-		s.respondAlertAndLog(w, err,
-			fmt.Sprintf("An error occurred fetching package index of %v in repository %v", pkgName, repositoryName),
-			"danger")
+	if values, err := extractValues(r, mf); err != nil {
+		s.respondAlertAndLog(w, err, "An error occurred parsing the form", "danger")
 		return
-	}
-	latestVersion := idx.LatestVersion
-
-	if selectedVersion == "" {
-		selectedVersion = latestVersion
-	} else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool {
-		return item.Version == selectedVersion
-	}) {
-		selectedVersion = latestVersion
-	}
-
-	if manifest == nil {
-		manifest = &v1alpha1.PackageManifest{}
-		if err := s.repoClientset.ForRepoWithName(repositoryName).
-			FetchPackageManifest(pkgName, selectedVersion, manifest); err != nil {
-			s.respondAlertAndLog(w, err,
-				fmt.Sprintf("An error occurred fetching manifest of %v in version %v in repository %v",
-					pkgName, selectedVersion, repositoryName),
-				"danger")
+	} else if pkg == nil {
+		pkg = client.PackageBuilder(manifestName).WithVersion(selectedVersion).
+			WithVersion(selectedVersion).
+			WithRepositoryName(repositoryName).
+			WithAutoUpdates(strings.ToLower(enableAutoUpdate) == "on").
+			WithValues(values).
+			WithNamespace(requestedNamespace).
+			WithName(requestedName).
+			BuildPackage()
+		opts := metav1.CreateOptions{}
+		err := install.NewInstaller(s.pkgClient).
+			WithStatusWriter(statuswriter.Stderr()).
+			Install(ctx, pkg, opts)
+		if err != nil {
+			s.respondAlertAndLog(w, err, "An error occurred installing "+manifestName, "danger")
+		} else {
+			s.swappingRedirect(w, "/packages", "main", "main")
+			w.WriteHeader(http.StatusAccepted)
+		}
+	} else {
+		pkg.Spec.Values = values
+		if err := s.pkgClient.Packages(pkg.GetNamespace()).Update(ctx, pkg); err != nil {
+			s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred updating package %v", manifestName), "danger")
 			return
 		}
-	}
-
-	res, err := s.dependencyMgr.Validate(r.Context(), manifest, selectedVersion)
-	if err != nil {
-		s.respondAlertAndLog(w, err,
-			fmt.Sprintf("An error occurred validating dependencies of %v in version %v", pkgName, selectedVersion),
-			"danger")
-		return
-	}
-
-	valueErrors := make(map[string]error)
-	datalistOptions := make(map[string]*pkg_config_input.PkgConfigInputDatalistOptions)
-	if pkg != nil {
-		nsOptions, _ := s.getNamespaceOptions()
-		pkgsOptions, _ := s.getPackagesOptions(r.Context())
-		for key, v := range pkg.Spec.Values {
-			if _, err := s.valueResolver.ResolveValue(r.Context(), v); err != nil {
-				valueErrors[key] = util.GetRootCause(err)
-			}
-			if v.ValueFrom != nil {
-				options, err := s.getDatalistOptions(r.Context(), v.ValueFrom, nsOptions, pkgsOptions)
-				if err != nil {
-					fmt.Fprintf(os.Stderr, "%v\n", err)
-				}
-				datalistOptions[key] = options
-			}
+		if _, err := s.valueResolver.Resolve(ctx, values); err != nil {
+			s.respondAlertAndLog(w, err, "Some values could not be resolved: ", "warning")
+		} else {
+			s.respondSuccess(w)
 		}
 	}
-
-	err = s.templates.pkgPageTmpl.Execute(w, s.enrichPage(r, map[string]any{
-		"Package":            pkg,
-		"Status":             client.GetStatusOrPending(pkg),
-		"Manifest":           manifest,
-		"LatestVersion":      latestVersion,
-		"UpdateAvailable":    pkg != nil && s.isUpdateAvailable(r.Context(), pkgName),
-		"AutoUpdate":         clientutils.AutoUpdateString(pkg, "Disabled"),
-		"ValidationResult":   res,
-		"ShowConflicts":      res.Status == dependency.ValidationResultStatusConflict,
-		"SelectedVersion":    selectedVersion,
-		"PackageIndex":       &idx,
-		"Repositories":       repos,
-		"RepositoryName":     repositoryName,
-		"ShowConfiguration":  (pkg != nil && len(manifest.ValueDefinitions) > 0 && pkg.DeletionTimestamp.IsZero()) || pkg == nil,
-		"ValueErrors":        valueErrors,
-		"DatalistOptions":    datalistOptions,
-		"ShowDiscussionLink": usedRepo.IsGlasskubeRepo(),
-	}, err))
-	checkTmplError(err, fmt.Sprintf("package-detail (%s)", pkgName))
 }
 
-// installOrConfigurePackage is an endpoint which takes POST requests, containing all necessary parameters to either
+// installOrConfigureClusterPackage is an endpoint which takes POST requests, containing all necessary parameters to either
 // install a new package if it does not exist yet, or update the configuration of an existing package.
 // The name of the concerned package is given in the pkgName query parameter.
 // In case the given package is not installed yet in the cluster, there must be a form parameter selectedVersion
 // containing which version should be installed.
 // In either case, the parameters from the form are parsed and converted into ValueConfiguration objects, which are
 // being set in the packages spec.
-func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Request) {
+func (s *server) installOrConfigureClusterPackage(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	pkgName := mux.Vars(r)["pkgName"]
 	repositoryName := r.FormValue("repositoryName")
 	selectedVersion := r.FormValue("selectedVersion")
 	enableAutoUpdate := r.FormValue("enableAutoUpdate")
+	var err error
 	pkg := &v1alpha1.ClusterPackage{}
-	var mf v1alpha1.PackageManifest
-	if err := s.pkgClient.ClusterPackages().Get(ctx, pkgName, pkg); err != nil && !apierrors.IsNotFound(err) {
+	var mf *v1alpha1.PackageManifest
+	if err = s.pkgClient.ClusterPackages().Get(ctx, pkgName, pkg); err != nil && !apierrors.IsNotFound(err) {
 		s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", pkgName), "danger")
 		return
 	} else if err != nil {
 		pkg = nil
 	}
 
-	if pkg == nil {
-		var repoClient repoclient.RepoClient
-		if len(repositoryName) == 0 {
-			repos, err := s.repoClientset.Meta().GetReposForPackage(pkgName)
-			if err != nil {
-				s.respondAlertAndLog(w, err, "", "danger")
-				return
-			}
-			switch len(repos) {
-			case 0:
-				// TODO: show error in UI
-				fmt.Fprintf(os.Stderr, "package not found in any repository")
-				return
-			case 1:
-				repositoryName = repos[0].Name
-				repoClient = s.repoClientset.ForRepo(repos[0])
-			default:
-				// TODO: show error in UI
-				fmt.Fprintf(os.Stderr, "package found in multiple repositories")
-				return
-			}
-		} else {
-			repoClient = s.repoClientset.ForRepoWithName(repositoryName)
-		}
-		if err := repoClient.FetchPackageManifest(pkgName, selectedVersion, &mf); err != nil {
-			s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching manifest of %v in version %v", pkgName, selectedVersion), "danger")
-			return
-		}
-	} else {
-		if mf1, err := manifest.GetInstalledManifestForPackage(ctx, pkg); err != nil {
-			s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred fetching package details of %v", pkgName), "danger")
-			return
-		} else {
-			mf = *mf1
-		}
+	repositoryName, mf, err = s.getUsedRepoAndManifest(ctx, pkg, repositoryName, pkgName, selectedVersion)
+	if err != nil {
+		s.respondAlertAndLog(w, err, fmt.Sprintf("An error occurred getting manifest and repo for %s", pkgName), "danger")
+		return
 	}
 
-	if values, err := extractValues(r, &mf); err != nil {
+	if values, err := extractValues(r, mf); err != nil {
 		s.respondAlertAndLog(w, err, "An error occurred parsing the form", "danger")
 		return
 	} else if pkg == nil {
-		pkg = client.ClusterPackageBuilder(pkgName).
+		pkg = client.PackageBuilder(pkgName).WithVersion(selectedVersion).
 			WithVersion(selectedVersion).
 			WithRepositoryName(repositoryName).
 			WithAutoUpdates(strings.ToLower(enableAutoUpdate) == "on").
 			WithValues(values).
-			Build()
+			BuildClusterPackage()
 		opts := metav1.CreateOptions{}
 		err := install.NewInstaller(s.pkgClient).
 			WithStatusWriter(statuswriter.Stderr()).
 			Install(ctx, pkg, opts)
 		if err != nil {
 			s.respondAlertAndLog(w, err, "An error occurred installing "+pkgName, "danger")
-			return
 		}
 	} else {
 		pkg.Spec.Values = values
@@ -587,26 +652,58 @@ func (s *server) installOrConfigurePackage(w http.ResponseWriter, r *http.Reques
 		if _, err := s.valueResolver.Resolve(ctx, values); err != nil {
 			s.respondAlertAndLog(w, err, "Some values could not be resolved: ", "warning")
 		} else {
-			err := s.templates.alertTmpl.Execute(w, map[string]any{
-				"Message":     "Configuration updated successfully",
-				"Dismissible": true,
-				"Type":        "success",
-			})
-			checkTmplError(err, "success")
+			s.respondSuccess(w)
+		}
+	}
+}
+
+func (s *server) getUsedRepoAndManifest(ctx context.Context, pkg ctrlpkg.Package, repositoryName string, manifestName string, selectedVersion string) (
+	string, *v1alpha1.PackageManifest, error) {
+
+	var mf v1alpha1.PackageManifest
+	if pkg.IsNil() {
+		var repoClient repoclient.RepoClient
+		if len(repositoryName) == 0 {
+			repos, err := s.repoClientset.Meta().GetReposForPackage(manifestName)
+			if err != nil {
+				return "", nil, err
+			}
+			switch len(repos) {
+			case 0:
+				return "", nil, errors.New("package not found in any repository")
+			case 1:
+				repositoryName = repos[0].Name
+				repoClient = s.repoClientset.ForRepo(repos[0])
+			default:
+				return "", nil, errors.New("package found in multiple repositories")
+			}
+		} else {
+			repoClient = s.repoClientset.ForRepoWithName(repositoryName)
+		}
+		if err := repoClient.FetchPackageManifest(manifestName, selectedVersion, &mf); err != nil {
+			return "", nil, err
+		}
+	} else {
+		if installedMf, err := manifest.GetInstalledManifestForPackage(ctx, pkg); err != nil {
+			return "", nil, err
+		} else {
+			mf = *installedMf
 		}
 	}
+	return repositoryName, &mf, nil
 }
 
-// advancedConfiguration is a GET+POST endpoint which can be used for advanced package installation options, most notably
-// for changing the package repository and changing to a specific (maybe even lower than installed) version of the package.
-// It is only intended to be used for already installed packages, for new packages these options exist anyway and
-// should be available for every user.
-func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) {
+// advancedClusterPackageConfiguration is a GET+POST endpoint which can be used for advanced package installation options,
+// most notably for changing the package repository and changing to a specific (maybe even lower than installed)
+// version of the package.
+// It is only intended to be used for already installed clusterpackages, for new clusterpackages these options exist
+// anyway and should be available for every user.
+func (s *server) advancedClusterPackageConfiguration(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	pkgName := mux.Vars(r)["pkgName"]
 	repositoryName := r.FormValue("repositoryName")
 	selectedVersion := r.FormValue("selectedVersion")
-	pkg, manifest, err := describe.DescribeInstalledPackage(ctx, pkgName)
+	pkg, manifest, err := describe.DescribeInstalledClusterPackage(ctx, pkgName)
 	if err != nil && !apierrors.IsNotFound(err) {
 		s.respondAlertAndLog(w, err,
 			fmt.Sprintf("An error occurred fetching package details of installed package %v", pkgName),
@@ -620,16 +717,58 @@ func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) {
 	} else if repositoryName == "" {
 		repositoryName = pkg.Spec.PackageInfo.RepositoryName
 	}
+	s.handleAdvancedConfig(ctx, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    pkgName,
+		pkg:             pkg,
+		manifest:        manifest,
+	}, r, w)
+}
+
+// advancedPackageConfiguration is like advancedClusterPackageConfiguration but for packages
+func (s *server) advancedPackageConfiguration(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	manifestName := mux.Vars(r)["manifestName"]
+	namespace := mux.Vars(r)["namespace"]
+	name := mux.Vars(r)["name"]
+	repositoryName := r.FormValue("repositoryName")
+	selectedVersion := r.FormValue("selectedVersion")
+	pkg, manifest, err := describe.DescribeInstalledPackage(ctx, namespace, name)
+	if err != nil && !apierrors.IsNotFound(err) {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("An error occurred fetching package details of installed package %v", manifestName),
+			"danger")
+		return
+	} else if pkg == nil {
+		s.respondAlertAndLog(w, err,
+			fmt.Sprintf("Package %v is not installed", manifestName),
+			"danger")
+		return
+	} else if repositoryName == "" {
+		repositoryName = pkg.Spec.PackageInfo.RepositoryName
+	}
+	s.handleAdvancedConfig(ctx, &packageDetailPageContext{
+		repositoryName:  repositoryName,
+		selectedVersion: selectedVersion,
+		manifestName:    manifestName,
+		pkg:             pkg,
+		manifest:        manifest,
+	}, r, w)
+}
+
+func (s *server) handleAdvancedConfig(ctx context.Context, d *packageDetailPageContext, r *http.Request, w http.ResponseWriter) {
+	var err error
 	var repos []v1alpha1.PackageRepository
-	if repos, err = s.repoClientset.Meta().GetReposForPackage(pkgName); err != nil {
+	if repos, err = s.repoClientset.Meta().GetReposForPackage(d.manifestName); err != nil {
 		fmt.Fprintf(os.Stderr, "error getting repos for package; %v", err)
-	} else if repositoryName == "" {
+	} else if d.repositoryName == "" {
 		if len(repos) == 0 {
-			s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", pkgName), "", "danger")
+			s.respondAlertAndLog(w, fmt.Errorf("%v not found in any repository", d.manifestName), "", "danger")
 			return
 		}
 		for _, r := range repos {
-			repositoryName = r.Name
+			d.repositoryName = r.Name
 			if r.IsDefaultRepository() {
 				break
 			}
@@ -638,59 +777,71 @@ func (s *server) advancedConfiguration(w http.ResponseWriter, r *http.Request) {
 
 	if r.Method == http.MethodGet {
 		var idx repo.PackageIndex
-		if err := s.repoClientset.ForRepoWithName(repositoryName).FetchPackageIndex(pkgName, &idx); err != nil {
+		if err := s.repoClientset.ForRepoWithName(d.repositoryName).FetchPackageIndex(d.manifestName, &idx); err != nil {
 			s.respondAlertAndLog(w, err,
-				fmt.Sprintf("An error occurred fetching package index of %v in repository %v", pkgName, repositoryName),
+				fmt.Sprintf("An error occurred fetching package index of %v in repository %v", d.manifestName, d.repositoryName),
 				"danger")
 			return
 		}
 		latestVersion := idx.LatestVersion
 
-		if selectedVersion == "" {
-			selectedVersion = latestVersion
-		} else if !slices.ContainsFunc(idx.Versions, func(item types.PackageIndexItem) bool {
-			return item.Version == selectedVersion
+		if d.selectedVersion == "" {
+			d.selectedVersion = latestVersion
+		} else if !slices.ContainsFunc(idx.Versions, func(item repotypes.PackageIndexItem) bool {
+			return item.Version == d.selectedVersion
 		}) {
-			selectedVersion = latestVersion
+			d.selectedVersion = latestVersion
 		}
 
-		res, err := s.dependencyMgr.Validate(r.Context(), manifest, selectedVersion)
+		res, err := s.dependencyMgr.Validate(r.Context(), d.manifest, d.selectedVersion)
 		if err != nil {
 			s.respondAlertAndLog(w, err,
-				fmt.Sprintf("An error occurred validating dependencies of %v in version %v", pkgName, selectedVersion),
+				fmt.Sprintf("An error occurred validating dependencies of %v in version %v", d.manifestName, d.selectedVersion),
 				"danger")
 			return
 		}
 
 		err = s.templates.pkgConfigAdvancedTmpl.Execute(w, s.enrichPage(r, map[string]any{
-			"Status":           client.GetStatusOrPending(pkg),
-			"Manifest":         manifest,
+			"Status":           client.GetStatusOrPending(d.pkg),
+			"Manifest":         d.manifest,
 			"LatestVersion":    latestVersion,
 			"ValidationResult": res,
 			"ShowConflicts":    res.Status == dependency.ValidationResultStatusConflict,
-			"SelectedVersion":  selectedVersion,
+			"SelectedVersion":  d.selectedVersion,
 			"PackageIndex":     &idx,
 			"Repositories":     repos,
-			"RepositoryName":   repositoryName,
+			"RepositoryName":   d.repositoryName,
+			"SelfHref":         fmt.Sprintf("%s/configure/advanced", util.GetPackageHref(d.pkg, d.manifest)),
 		}, err))
-		checkTmplError(err, fmt.Sprintf("advanced-config (%s)", pkgName))
+		checkTmplError(err, fmt.Sprintf("advanced-config (%s)", d.manifestName))
 	} else if r.Method == http.MethodPost {
-		pkg.Spec.PackageInfo.Version = selectedVersion
-		if repositoryName != "" {
-			pkg.Spec.PackageInfo.RepositoryName = repositoryName
+		d.pkg.GetSpec().PackageInfo.Version = d.selectedVersion
+		if d.repositoryName != "" {
+			d.pkg.GetSpec().PackageInfo.RepositoryName = d.repositoryName
 		}
-		if err := s.pkgClient.ClusterPackages().Update(ctx, pkg); err != nil {
-			s.respondAlertAndLog(w, err,
-				fmt.Sprintf("An error occurred updating package %v to version %v in repo %v", pkgName, selectedVersion, repositoryName),
-				"danger")
-			return
-		} else {
-			err := s.templates.alertTmpl.Execute(w, map[string]any{
-				"Message":     "Configuration updated successfully",
-				"Dismissible": true,
-				"Type":        "success",
-			})
-			checkTmplError(err, "success")
+		switch pkg := d.pkg.(type) {
+		case *v1alpha1.ClusterPackage:
+			if err := s.pkgClient.ClusterPackages().Update(ctx, pkg); err != nil {
+				s.respondAlertAndLog(w, err,
+					fmt.Sprintf("An error occurred updating clusterpackage %v to version %v in repo %v",
+						d.manifestName, d.selectedVersion, d.repositoryName),
+					"danger")
+				return
+			} else {
+				s.respondSuccess(w)
+			}
+		case *v1alpha1.Package:
+			if err := s.pkgClient.Packages(d.pkg.GetNamespace()).Update(ctx, pkg); err != nil {
+				s.respondAlertAndLog(w, err,
+					fmt.Sprintf("An error occurred updating package %v to version %v in repo %v",
+						d.manifestName, d.selectedVersion, d.repositoryName),
+					"danger")
+				return
+			} else {
+				s.respondSuccess(w)
+			}
+		default:
+			panic("unexpected package type")
 		}
 	}
 }
@@ -936,13 +1087,15 @@ func (server *server) initWhenBootstrapped(ctx context.Context) {
 }
 
 func (server *server) initCachedClient(ctx context.Context) {
+	clusterPackageStore, clusterPackageController := server.initClusterPackageStoreAndController(ctx)
 	packageStore, packageController := server.initPackageStoreAndController(ctx)
 	packageInfoStore, packageInfoController := server.initPackageInfoStoreAndController(ctx)
 	packageRepoStore, packageRepoController := server.initPackageRepoStoreAndController(ctx)
+	go clusterPackageController.Run(ctx.Done())
 	go packageController.Run(ctx.Done())
 	go packageInfoController.Run(ctx.Done())
 	go packageRepoController.Run(ctx.Done())
-	server.pkgClient = server.pkgClient.WithStores(packageStore, packageInfoStore, packageRepoStore)
+	server.pkgClient = server.pkgClient.WithStores(clusterPackageStore, packageStore, packageInfoStore, packageRepoStore)
 }
 
 func (s *server) enrichContext(h http.Handler) http.Handler {
@@ -994,7 +1147,7 @@ func defaultKubeconfigExists() bool {
 	}
 }
 
-func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) {
+func (s *server) initClusterPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) {
 	pkgClient := s.pkgClient
 	return cache.NewInformer(
 		&cache.ListWatch{
@@ -1012,32 +1165,86 @@ func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj any) {
 				if pkg, ok := obj.(*v1alpha1.ClusterPackage); ok {
-					s.broadcastRefreshTriggers(pkg)
+					s.broadcastClusterPackageRefreshTriggers(pkg)
 				}
 			},
 			UpdateFunc: func(oldObj, newObj any) {
 				if pkg, ok := newObj.(*v1alpha1.ClusterPackage); ok {
-					s.broadcastRefreshTriggers(pkg)
+					s.broadcastClusterPackageRefreshTriggers(pkg)
 				}
 			},
 			DeleteFunc: func(obj any) {
 				if pkg, ok := obj.(*v1alpha1.ClusterPackage); ok {
-					s.broadcastRefreshTriggers(pkg)
+					s.broadcastClusterPackageRefreshTriggers(pkg)
+					fwName := pkg.GetName()
+					if result, ok := s.forwarders[fwName]; ok {
+						result.Stop()
+						delete(s.forwarders, fwName)
+					}
 				}
 			},
 		},
 	)
 }
 
-func (s *server) broadcastRefreshTriggers(pkg *v1alpha1.ClusterPackage) {
+func (s *server) initPackageStoreAndController(ctx context.Context) (cache.Store, cache.Controller) {
+	pkgClient := s.pkgClient
+	return cache.NewInformer(
+		&cache.ListWatch{
+			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
+				var pkgList v1alpha1.PackageList
+				err := pkgClient.Packages("").GetAll(ctx, &pkgList)
+				return &pkgList, err
+			},
+			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
+				return pkgClient.Packages("").Watch(ctx, withDecreasedTimeout(options))
+			},
+		},
+		&v1alpha1.Package{},
+		0,
+		cache.ResourceEventHandlerFuncs{
+			AddFunc: func(obj any) {
+				if pkg, ok := obj.(*v1alpha1.Package); ok {
+					s.broadcastPackageRefreshTriggers(pkg)
+				}
+			},
+			UpdateFunc: func(oldObj, newObj any) {
+				if pkg, ok := newObj.(*v1alpha1.Package); ok {
+					s.broadcastPackageRefreshTriggers(pkg)
+				}
+			},
+			DeleteFunc: func(obj any) {
+				if pkg, ok := obj.(*v1alpha1.Package); ok {
+					s.broadcastPackageRefreshTriggers(pkg)
+					fwName := cache.ObjectName{Namespace: pkg.GetNamespace(), Name: pkg.GetName()}.String()
+					if result, ok := s.forwarders[fwName]; ok {
+						result.Stop()
+						delete(s.forwarders, fwName)
+					}
+				}
+			},
+		},
+	)
+}
+
+func (s *server) broadcastClusterPackageRefreshTriggers(pkg *v1alpha1.ClusterPackage) {
 	s.sseHub.Broadcast <- &sse{
-		event: "refresh-pkg-overview",
+		event: "refresh-clusterpackage-overview",
 	}
 	s.sseHub.Broadcast <- &sse{
 		event: fmt.Sprintf("refresh-pkg-detail-%s", pkg.Name),
 	}
 }
 
+func (s *server) broadcastPackageRefreshTriggers(pkg *v1alpha1.Package) {
+	s.sseHub.Broadcast <- &sse{
+		event: "refresh-package-overview",
+	}
+	s.sseHub.Broadcast <- &sse{
+		event: fmt.Sprintf("refresh-pkg-detail-%s-%s", pkg.Namespace, pkg.Name),
+	}
+}
+
 func (s *server) initPackageInfoStoreAndController(ctx context.Context) (cache.Store, cache.Controller) {
 	pkgClient := s.pkgClient
 	return cache.NewInformer(
@@ -1085,33 +1292,20 @@ func withDecreasedTimeout(opts metav1.ListOptions) metav1.ListOptions {
 	return opts
 }
 
-func (s *server) isUpdateAvailable(ctx context.Context, packages ...string) bool {
-	if tx, err := update.NewUpdater(ctx).Prepare(ctx, packages); err != nil {
-		fmt.Fprintf(os.Stderr, "Error checking for updates: %v\n", err)
+func (s *server) isUpdateAvailableForPkg(ctx context.Context, pkg ctrlpkg.Package) bool {
+	if pkg.IsNil() {
 		return false
-	} else {
-		return !tx.IsEmpty()
 	}
+	return s.isUpdateAvailable(ctx, []ctrlpkg.Package{pkg})
 }
 
-func (s *server) respondAlertAndLog(w http.ResponseWriter, err error, wrappingMsg string, alertType string) {
-	if wrappingMsg != "" {
-		err = fmt.Errorf("%v: %w", wrappingMsg, err)
+func (s *server) isUpdateAvailable(ctx context.Context, pkgs []ctrlpkg.Package) bool {
+	if tx, err := update.NewUpdater(ctx).Prepare(ctx, update.GetExact(pkgs)); err != nil {
+		fmt.Fprintf(os.Stderr, "Error checking for updates: %v\n", err)
+		return false
+	} else {
+		return !tx.IsEmpty()
 	}
-	fmt.Fprintf(os.Stderr, "%v\n", err)
-	s.respondAlert(w, err.Error(), alertType)
-}
-
-func (s *server) respondAlert(w http.ResponseWriter, message string, alertType string) {
-	w.Header().Add("Hx-Reselect", "div.alert") // overwrite any existing hx-select (which was a little intransparent sometimes)
-	w.Header().Add("Hx-Reswap", "afterbegin")
-	w.WriteHeader(http.StatusBadRequest)
-	err := s.templates.alertTmpl.Execute(w, map[string]any{
-		"Message":     message,
-		"Dismissible": true,
-		"Type":        alertType,
-	})
-	checkTmplError(err, "alert")
 }
 
 func isPortConflictError(err error) bool {
diff --git a/internal/web/templates.go b/internal/web/templates.go
index 9431e651b..7ad11054d 100644
--- a/internal/web/templates.go
+++ b/internal/web/templates.go
@@ -31,23 +31,24 @@ import (
 )
 
 type templates struct {
-	templateFuncs          template.FuncMap
-	baseTemplate           *template.Template
-	pkgsPageTmpl           *template.Template
-	pkgPageTmpl            *template.Template
-	pkgDiscussionPageTmpl  *template.Template
-	supportPageTmpl        *template.Template
-	bootstrapPageTmpl      *template.Template
-	kubeconfigPageTmpl     *template.Template
-	settingsPageTmpl       *template.Template
-	pkgUpdateModalTmpl     *template.Template
-	pkgConfigInput         *template.Template
-	pkgConfigAdvancedTmpl  *template.Template
-	pkgUninstallModalTmpl  *template.Template
-	alertTmpl              *template.Template
-	datalistTmpl           *template.Template
-	pkgDiscussionBadgeTmpl *template.Template
-	repoClientset          repoclient.RepoClientset
+	templateFuncs           template.FuncMap
+	baseTemplate            *template.Template
+	clusterPkgsPageTemplate *template.Template
+	pkgsPageTmpl            *template.Template
+	pkgPageTmpl             *template.Template
+	pkgDiscussionPageTmpl   *template.Template
+	supportPageTmpl         *template.Template
+	bootstrapPageTmpl       *template.Template
+	kubeconfigPageTmpl      *template.Template
+	settingsPageTmpl        *template.Template
+	pkgUpdateModalTmpl      *template.Template
+	pkgConfigInput          *template.Template
+	pkgConfigAdvancedTmpl   *template.Template
+	pkgUninstallModalTmpl   *template.Template
+	alertTmpl               *template.Template
+	datalistTmpl            *template.Template
+	pkgDiscussionBadgeTmpl  *template.Template
+	repoClientset           repoclient.RepoClientset
 }
 
 var (
@@ -77,9 +78,9 @@ func (t *templates) watchTemplates() error {
 
 func (t *templates) parseTemplates() {
 	t.templateFuncs = template.FuncMap{
-		"ForPkgOverviewBtn": pkg_overview_btn.ForPkgOverviewBtn,
-		"ForPkgDetailBtns":  pkg_detail_btns.ForPkgDetailBtns,
-		"ForPkgUpdateAlert": pkg_update_alert.ForPkgUpdateAlert,
+		"ForClPkgOverviewBtn": pkg_overview_btn.ForClPkgOverviewBtn,
+		"ForPkgDetailBtns":    pkg_detail_btns.ForPkgDetailBtns,
+		"ForPkgUpdateAlert":   pkg_update_alert.ForPkgUpdateAlert,
 		"PackageManifestUrl": func(pkg ctrlpkg.Package) string {
 			if !pkg.IsNil() {
 				url, err := t.repoClientset.ForPackage(pkg).
@@ -135,11 +136,21 @@ func (t *templates) parseTemplates() {
 			cond := meta.FindStatusCondition(repo.Status.Conditions, string(condition.Ready))
 			return cond != nil && cond.Status == metav1.ConditionTrue
 		},
+		"PackageDetailRefreshId": func(manifest *v1alpha1.PackageManifest, pkg ctrlpkg.Package) string {
+			var id string
+			if manifest.Scope.IsCluster() {
+				id = manifest.Name
+			} else if !pkg.IsNil() {
+				id = fmt.Sprintf("%s-%s", pkg.GetNamespace(), pkg.GetName())
+			}
+			return fmt.Sprintf("refresh-pkg-detail-%s", id)
+		},
 	}
 
 	t.baseTemplate = template.Must(template.New("base.html").
 		Funcs(t.templateFuncs).
 		ParseFS(webFs, path.Join(templatesDir, "layout", "base.html")))
+	t.clusterPkgsPageTemplate = t.pageTmpl("clusterpackages.html")
 	t.pkgsPageTmpl = t.pageTmpl("packages.html")
 	t.pkgPageTmpl = t.pageTmpl("package.html")
 	t.pkgDiscussionPageTmpl = t.pageTmpl("discussion.html")
diff --git a/internal/web/templates/components/pkg-overview-btn.html b/internal/web/templates/components/clpkg-overview-btn.html
similarity index 85%
rename from internal/web/templates/components/pkg-overview-btn.html
rename to internal/web/templates/components/clpkg-overview-btn.html
index 926275d5c..2c71ef932 100644
--- a/internal/web/templates/components/pkg-overview-btn.html
+++ b/internal/web/templates/components/clpkg-overview-btn.html
@@ -1,8 +1,8 @@
-{{ define "pkg-overview-btn" }}
+{{ define "clpkg-overview-btn" }}
   <span id="{{ .ButtonId }}">
     {{ if eq .Status nil }}
       <a
-        href="/packages/{{ .PackageName }}#configuration"
+        href="{{ .PackageHref }}#configuration"
         hx-boost="true"
         hx-select="main"
         hx-target="main"
@@ -10,7 +10,7 @@
         class="btn btn-primary btn-sm w-100"
         >Install</a
       >
-    {{ else if not .Pkg.DeletionTimestamp.IsZero }}
+    {{ else if .InDeletion }}
       <div>
         <button type="button" class="btn btn-primary btn-sm fw-medium w-100" disabled>Uninstalling</button>
       </div>
@@ -21,8 +21,9 @@
         <span>Installation Failed</span>
       </div>
     {{ else if .UpdateAvailable }}
+      <!-- TODO update modal only for clpkgs or all?-->
       <button
-        hx-get="/packages/update/modal"
+        hx-get="{{ .PackageHref }}/update"
         hx-target="#modal-container"
         hx-swap="innerHTML"
         hx-select="#pkg-update-modal"
@@ -36,7 +37,7 @@
     {{ else if and .Manifest .Manifest.Entrypoints }}
       <button
         class="btn btn-success btn-sm w-100"
-        hx-post="/packages/open"
+        hx-post="{{ .PackageHref }}/open"
         hx-swap="none"
         name="packageName"
         value="{{ .PackageName }}">
diff --git a/internal/web/templates/components/pkg-config-advanced.html b/internal/web/templates/components/pkg-config-advanced.html
index 31a722898..3b2e33a02 100644
--- a/internal/web/templates/components/pkg-config-advanced.html
+++ b/internal/web/templates/components/pkg-config-advanced.html
@@ -8,7 +8,7 @@ <h2 class="text-reset">Advanced Options</h2>
     </div>
 
     <form
-      hx-post="/packages/{{ .Manifest.Name }}/configure/advanced"
+      hx-post="{{ .SelfHref }}"
       hx-target="#error-container"
       hx-target-error="#error-container"
       hx-select="div.alert"
@@ -24,7 +24,7 @@ <h2 class="text-reset">Advanced Options</h2>
             hx-select="#advanced-options"
             hx-swap="outerHTML"
             hx-target="#advanced-options"
-            hx-get="/packages/{{ .Manifest.Name }}/configure/advanced"
+            hx-get="{{ .SelfHref }}"
             hx-include="#advanced-pkg-install-version">
             {{ range .Repositories }}
               <option value="{{ .Name }}" {{ if eq .Name $.RepositoryName }}selected{{ end }}>
@@ -44,7 +44,7 @@ <h2 class="text-reset">Advanced Options</h2>
           hx-select="#advanced-options"
           hx-swap="outerHTML"
           hx-target="#advanced-options"
-          hx-get="/packages/{{ .Manifest.Name }}/configure/advanced"
+          hx-get="{{ .SelfHref }}"
           hx-include="#advanced-pkg-install-repository">
           {{ with $idx := .PackageIndex }}
             {{ range $idx.Versions | Reversed }}
diff --git a/internal/web/templates/components/pkg-config-input.html b/internal/web/templates/components/pkg-config-input.html
index 558fbee8e..f343b66d3 100644
--- a/internal/web/templates/components/pkg-config-input.html
+++ b/internal/web/templates/components/pkg-config-input.html
@@ -8,7 +8,7 @@
       <li>
         <button
           class="dropdown-item btn btn-sm"
-          hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}?refKind=Secret&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
+          hx-get="{{ .PackageHref }}/configuration/{{ .ValueName }}?refKind=Secret&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
           hx-target="#{{ .ContainerId }}"
           hx-select="#{{ .ContainerId }}"
           hx-swap="outerHTML">
@@ -18,7 +18,7 @@
       <li>
         <button
           class="dropdown-item btn btn-sm"
-          hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}?refKind=ConfigMap&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
+          hx-get="{{ .PackageHref }}/configuration/{{ .ValueName }}?refKind=ConfigMap&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
           hx-target="#{{ .ContainerId }}"
           hx-select="#{{ .ContainerId }}"
           hx-swap="outerHTML">
@@ -28,7 +28,7 @@
       <li>
         <button
           class="dropdown-item btn btn-sm"
-          hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}?refKind=Package&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
+          hx-get="{{ .PackageHref }}/configuration/{{ .ValueName }}?refKind=Package&repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
           hx-target="#{{ .ContainerId }}"
           hx-select="#{{ .ContainerId }}"
           hx-swap="outerHTML">
@@ -40,7 +40,7 @@
         <li>
           <button
             class="dropdown-item btn btn-sm"
-            hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}?repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
+            hx-get="{{ .PackageHref }}/configuration/{{ .ValueName }}?repositoryName={{ .RepositoryName }}&selectedVersion={{ .SelectedVersion | UrlEscape }}"
             hx-target="#{{ .ContainerId }}"
             hx-select="#{{ .ContainerId }}"
             hx-swap="outerHTML">
@@ -88,7 +88,7 @@
       class="form-control"
       placeholder="Name"
       aria-label="Name"
-      hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}/datalists/names?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-names"
+      hx-get="/datalists/{{ .ValueName }}/names?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-names"
       hx-include="#input-{{ .ValueName }}-namespace"
       hx-swap="outerHTML"
       hx-target="#{{ .ValueName }}-names"
@@ -108,7 +108,7 @@
       class="form-control"
       placeholder="Key"
       aria-label="Key"
-      hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}/datalists/keys?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-keys"
+      hx-get="/datalists/{{ .ValueName }}/keys?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-keys"
       hx-include="#input-{{ .ValueName }}-namespace,#input-{{ .ValueName }}-name"
       hx-swap="outerHTML"
       hx-target="#{{ .ValueName }}-keys"
@@ -137,7 +137,7 @@
       list="{{ .ValueName }}-keys"
       placeholder="Value"
       aria-label="Value"
-      hx-get="/packages/{{ .PkgName }}/configuration/{{ .ValueName }}/datalists/keys?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-keys"
+      hx-get="/datalists/{{ .ValueName }}/keys?refKind={{ .ValueReferenceKind }}&id={{ .ValueName }}-keys"
       hx-include="#input-{{ .ValueName }}-name"
       hx-swap="outerHTML"
       hx-target="#{{ .ValueName }}-keys"
@@ -156,6 +156,7 @@
     value="{{ .StringValue }}"
     class="form-control"
     id="{{ .FormId }}"
+    {{ if .ValueDefinition.Constraints.Required }}required{{ end }}
     {{ if ne .ValueDefinition.Constraints.MinLength nil }}
       minlength="{{ .ValueDefinition.Constraints.MinLength }}"
     {{ end }}
@@ -173,6 +174,7 @@
     type="number"
     autocomplete="off"
     {{ if .Autofocus }}autofocus{{ end }}
+    {{ if .ValueDefinition.Constraints.Required }}required{{ end }}
     {{ if ne .ValueDefinition.Constraints.Min nil }}min="{{ .ValueDefinition.Constraints.Min }}"{{ end }}
     {{ if ne .ValueDefinition.Constraints.Max nil }}max="{{ .ValueDefinition.Constraints.Max }}"{{ end }}
     name="{{ .ValueName }}"
@@ -224,13 +226,23 @@
   {{ end }}
 {{ end }}
 
+{{ define "pkg-config-input-required-label" }}
+  <label for="{{ .FormId }}" class="form-label">
+    {{ .FormLabel }}
+    {{ if .ValueDefinition.Constraints.Required }}
+      <span class="text-danger">*</span>
+    {{ end }}
+    (<code>{{ .ValueName }}</code>)
+  </label>
+{{ end }}
+
 
-<!-- this is the entry point for rendering the the input group for one value definition -->
+<!-- this is the entry point for rendering the input group for one value definition -->
 {{ define "pkg-config-input" }}
   <div id="{{ .ContainerId }}" class="mb-2">
     {{ if eq .ValueDefinition.Type "text" }}
       <div>
-        <label for="{{ .FormId }}" class="form-label">{{ .FormLabel }} (<code>{{ .ValueName }}</code>)</label>
+        {{ template "pkg-config-input-required-label" . }}
         <div class="input-group input-group-sm">
           {{ template "pkg-config-input-reference-dropdown" . }}
           {{ if eq .ValueReferenceKind "" }}
@@ -244,7 +256,7 @@
       </div>
     {{ else if eq .ValueDefinition.Type "number" }}
       <div>
-        <label for="{{ .FormId }}" class="form-label">{{ .FormLabel }} (<code>{{ .ValueName }}</code>)</label>
+        {{ template "pkg-config-input-required-label" . }}
         <div class="input-group input-group-sm">
           {{ template "pkg-config-input-reference-dropdown" . }}
           {{ if eq .ValueReferenceKind "" }}
@@ -259,7 +271,7 @@
     {{ else if eq .ValueDefinition.Type "boolean" }}
       <div>
         {{ if ne .ValueReferenceKind "" }}
-          <label for="{{ .FormId }}" class="form-label">{{ .FormLabel }} (<code>{{ .ValueName }}</code>)</label>
+          {{ template "pkg-config-input-required-label" . }}
         {{ end }}
         <div class="input-group input-group-sm">
           {{ template "pkg-config-input-reference-dropdown" . }}
@@ -274,7 +286,7 @@
       </div>
     {{ else if eq .ValueDefinition.Type "options" }}
       <div>
-        <label for="{{ .FormId }}" class="form-label">{{ .FormLabel }} (<code>{{ .ValueName }}</code>)</label>
+        {{ template "pkg-config-input-required-label" . }}
         <div class="input-group input-group-sm">
           {{ template "pkg-config-input-reference-dropdown" . }}
           {{ if eq .ValueReferenceKind "" }}
diff --git a/internal/web/templates/components/pkg-detail-btns.html b/internal/web/templates/components/pkg-detail-btns.html
index c2cde7866..cdd995f7e 100644
--- a/internal/web/templates/components/pkg-detail-btns.html
+++ b/internal/web/templates/components/pkg-detail-btns.html
@@ -1,11 +1,9 @@
 {{ define "pkg-detail-uninstall" }}
   <button
-    hx-post="/packages/uninstall/modal"
+    hx-get="{{ .PackageHref }}/uninstall"
     hx-target="#modal-container"
     hx-swap="innerHTML"
     hx-select="#pkg-uninstall-modal"
-    name="packageName"
-    value="{{ .PackageName }}"
     class="btn btn-danger btn-sm"
     data-bs-toggle="modal"
     data-bs-target="#modal-container">
@@ -16,7 +14,7 @@
 {{ define "pkg-detail-update" }}
   {{ if .UpdateAvailable }}
     <button
-      hx-get="/packages/update/modal"
+      hx-get="{{ .PackageHref }}/update"
       hx-target="#modal-container"
       hx-swap="innerHTML"
       hx-select="#pkg-update-modal"
@@ -45,7 +43,7 @@
       {{ else if and .Manifest .Manifest.Entrypoints }}
         <button
           class="btn btn-success btn-sm"
-          hx-post="/packages/open"
+          hx-post="{{ .PackageHref }}/open"
           hx-swap="none"
           name="packageName"
           value="{{ .PackageName }}">
diff --git a/internal/web/templates/components/pkg-detail-header.html b/internal/web/templates/components/pkg-detail-header.html
index 92d5c7431..efd07b3e0 100644
--- a/internal/web/templates/components/pkg-detail-header.html
+++ b/internal/web/templates/components/pkg-detail-header.html
@@ -4,7 +4,7 @@
       <div class="flex-shrink-0 ps-1 pe-2 py-1 align-self-center">
         <a
           class="text-reset"
-          href="/packages/{{ .Manifest.Name }}"
+          href="{{ .PackageHref }}"
           hx-boost="true"
           hx-swap="outerHTML"
           hx-select="main"
@@ -21,7 +21,7 @@
           <span class="d-flex ">
             <a
               class="text-reset text-decoration-none flex-grow-1"
-              href="/packages/{{ .Manifest.Name }}"
+              href="{{ .PackageHref }}"
               hx-boost="true"
               hx-swap="outerHTML"
               hx-select="main"
@@ -47,23 +47,21 @@ <h1 class="text-reset m-0">
               hx-select="main"
               hx-target="main"
               hx-swap="outerHTML"
-              href="/packages/{{ .Manifest.Name }}{{ if .ShowDiscussionLink }}/discussion{{ end }}">
-              {{ if .ShowDiscussionLink }}
-                <span class="bi bi-heart-fill text-danger"></span>
-                <span class="bi bi-hand-thumbs-up-fill text-warning"></span>
-                <span class="bi bi-chat-left-text-fill text-info"></span>
-                <span
-                  id="discussion-link-badge"
-                  class="position-absolute top-0 start-100 translate-middle badge bg-accent lh-sm"
-                  hx-select="#discussion-link-badge"
-                  hx-target="this"
-                  hx-swap="outerHTML"
-                  hx-get="/packages/{{ .Manifest.Name }}/discussion/badge"
-                  hx-trigger="load"
-                  hx-indicator="this">
-                  &mldr;
-                </span>
-              {{ end }}
+              href="{{ .PackageHref }}/discussion">
+              <span class="bi bi-heart-fill text-danger"></span>
+              <span class="bi bi-hand-thumbs-up-fill text-warning"></span>
+              <span class="bi bi-chat-left-text-fill text-info"></span>
+              <span
+                id="discussion-link-badge"
+                class="position-absolute top-0 start-100 translate-middle badge bg-accent lh-sm"
+                hx-select="#discussion-link-badge"
+                hx-target="this"
+                hx-swap="outerHTML"
+                hx-get="{{ .PackageHref }}/discussion/badge"
+                hx-trigger="load"
+                hx-indicator="this">
+                &mldr;
+              </span>
             </a>
           {{ end }}
           {{ if PackageManifestUrl .Package }}
@@ -81,5 +79,31 @@ <h1 class="text-reset m-0">
         </div>
       </div>
     </div>
+    {{ if ne .Status nil }}
+      <div class="mt-2">
+        {{ if .Manifest.Scope.IsNamespaced }}
+          <span class="badge bg-body-secondary text-primary-emphasis border-primary border border-1 p-1 fw-normal">
+            Namespace:
+            <strong>{{ .Package.Namespace }}</strong>
+          </span>
+          <span class="badge bg-body-secondary text-primary-emphasis border-primary border border-1 p-1 fw-normal">
+            Name:
+            <strong>{{ .Package.Name }}</strong>
+          </span>
+        {{ end }}
+        <span class="badge bg-body-secondary text-primary-emphasis border-primary border border-1 p-1 fw-normal">
+          Repository:
+          <strong>{{ .Package.Spec.PackageInfo.RepositoryName }}</strong>
+        </span>
+        <span class="badge bg-body-secondary text-primary-emphasis border-primary border border-1 p-1 fw-normal">
+          Installed version:
+          <strong>{{ .Package.Spec.PackageInfo.Version }}</strong>
+        </span>
+        <span class="badge bg-body-secondary text-primary-emphasis border-primary border border-1 p-1 fw-normal">
+          Auto-Update:
+          <strong>{{ .AutoUpdate }}</strong>
+        </span>
+      </div>
+    {{ end }}
   </div>
 {{ end }}
diff --git a/internal/web/templates/components/pkg-uninstall-modal.html b/internal/web/templates/components/pkg-uninstall-modal.html
index 36104e6d6..0cf119e7c 100644
--- a/internal/web/templates/components/pkg-uninstall-modal.html
+++ b/internal/web/templates/components/pkg-uninstall-modal.html
@@ -1,9 +1,16 @@
+{{ define "pkg-uninstall-pkg-name" }}
+  {{ if .PackageName }}{{ .PackageName }}{{ else }}{{ .Namespace }}/{{ .Name }}{{ end }}
+{{ end }}
+
 {{ define "pkg-uninstall-modal" }}
   <div class="modal-dialog modal-dialog-centered" id="pkg-uninstall-modal">
     <div class="modal-content">
-      <form hx-post="/packages/uninstall">
+      <form hx-post="{{ .PackageHref }}/uninstall">
         <div class="modal-header">
-          <h1 class="modal-title fs-5">Uninstall {{ .PackageName }}</h1>
+          <h1 class="modal-title fs-5">
+            Uninstall
+            {{ template "pkg-uninstall-pkg-name" . }}
+          </h1>
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         {{ if eq .Err nil }}
@@ -11,7 +18,7 @@ <h1 class="modal-title fs-5">Uninstall {{ .PackageName }}</h1>
             <div class="alert alert-warning m-0" role="alert">
               <div>The following packages will be <strong>removed</strong> from your cluster:</div>
               <ul class="m-0 mt-1">
-                <li>{{ $.PackageName }} (requested by user)</li>
+                <li>{{ template "pkg-uninstall-pkg-name" . }} (requested by user)</li>
                 {{ range .Pruned }}
                   <li>{{ . }} (dependency)</li>
                 {{ end }}
@@ -20,14 +27,7 @@ <h1 class="modal-title fs-5">Uninstall {{ .PackageName }}</h1>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-outline-primary btn-sm" data-bs-dismiss="modal">Cancel</button>
-            <button
-              type="submit"
-              data-bs-dismiss="modal"
-              name="packageName"
-              class="btn btn-danger btn-sm"
-              value="{{ .PackageName }}">
-              Confirm
-            </button>
+            <button type="submit" data-bs-dismiss="modal" class="btn btn-danger btn-sm">Confirm</button>
           </div>
         {{ else }}
           <div class="modal-body" id="pkg-update-modal-body">
diff --git a/internal/web/templates/components/pkg-update-alert.html b/internal/web/templates/components/pkg-update-alert.html
index 6c01cbcf3..bf1db37eb 100644
--- a/internal/web/templates/components/pkg-update-alert.html
+++ b/internal/web/templates/components/pkg-update-alert.html
@@ -4,7 +4,7 @@
       <div class="alert alert-warning py-1 ps-2 pe-1 d-flex flex-row align-items-center" role="alert">
         <span class="flex-grow-1">Updates for your packages are available!</span>
         <button
-          hx-get="/packages/update/modal"
+          hx-get="{{ .PackageHref }}/update"
           hx-swap="innerHTML"
           hx-target="#modal-container"
           hx-select="#pkg-update-modal"
diff --git a/internal/web/templates/components/pkg-update-modal.html b/internal/web/templates/components/pkg-update-modal.html
index f93ebe075..a769c7116 100644
--- a/internal/web/templates/components/pkg-update-modal.html
+++ b/internal/web/templates/components/pkg-update-modal.html
@@ -1,7 +1,7 @@
 {{ define "pkg-update-modal" }}
   <div class="modal-dialog modal-dialog-centered" id="pkg-update-modal">
     <div class="modal-content">
-      <form hx-post="/packages/update">
+      <form hx-post="{{ .PackageHref }}/update">
         <input type="hidden" name="updateTransactionId" value="{{ .UpdateTransactionId }}" />
         <div class="modal-header">
           <h1 class="modal-title fs-5">Available Updates</h1>
@@ -19,7 +19,15 @@ <h1 class="modal-title fs-5">Available Updates</h1>
             <tbody>
               {{ range .Updates }}
                 <tr>
-                  <td><b>{{ .Name }}</b></td>
+                  <td>
+                    <b
+                      >{{ if not .Package.IsNamespaceScoped }}
+                        {{ .Package.Name }}
+                      {{ else }}
+                        {{ .Package.Namespace }}/{{ .Package.Name }}
+                      {{ end }}</b
+                    >
+                  </td>
                   <td>{{ .CurrentVersion }}</td>
                   <td>{{ .LatestVersion }}</td>
                 </tr>
diff --git a/internal/web/templates/layout/base.html b/internal/web/templates/layout/base.html
index 7db35ae82..5025b617a 100644
--- a/internal/web/templates/layout/base.html
+++ b/internal/web/templates/layout/base.html
@@ -16,35 +16,47 @@
     sse-connect="/events"
     hx-indicator="#indicator"
     hx-target-error="#error-container">
-    <nav class="navbar navbar-expand-lg navbar-dark bg-secondary">
+    <nav class="navbar navbar-expand-lg navbar-dark bg-secondary sticky-top">
       <div id="indicator" class="progress-container bg-transparent w-100 position-fixed top-0 start-0">
         <div class="htmx-indicator progress-bar bg-primary h-100 w-100"></div>
       </div>
 
-      <div class="container" hx-swap-oob="outerHTML:#navbar-content" id="navbar-content">
-        <a class="navbar-brand d-flex align-items-center" href="/">
-          <img src="/static/assets/glasskube-logo.svg" alt="Logo" height="32" width="32" />
-          <h1 class="navbar-brand text-white mx-1 my-0">Glasskube</h1>
-        </a>
+      <div class="container-lg d-flex flex-row" hx-swap-oob="outerHTML:#navbar-content" id="navbar-content">
+        <div class="d-flex  flex-row align-items-center justify-content-around">
+          <a class="navbar-brand d-flex align-items-center" href="/">
+            <img src="/static/assets/glasskube-logo.svg" alt="Logo" height="32" width="32" />
+            <h1 class="navbar-brand text-white mx-1 my-0">Glasskube</h1>
+          </a>
 
-        <ul class="navbar-nav" hx-boost="true" hx-select="main" hx-target="main" hx-swap="outerHTML">
-          <li class="nav-item mx-1">
-            {{ with $packages := "packages" }}
-              <a class="nav-link {{ if eq $.NavbarActiveItem $packages }}active{{ end }}" href="/packages">Packages</a>
-            {{ end }}
-          </li>
-          <li class="nav-item mx-1">
-            <a class="nav-link disabled">Apps</a>
-          </li>
-          <li class="nav-item mx-1">
-            {{ with $settings := "settings" }}
-              <a class="nav-link {{ if eq $.NavbarActiveItem $settings }}active{{ end }}" href="/settings">Settings</a>
-            {{ end }}
-          </li>
-        </ul>
+          <ul class="navbar-nav d-flex flex-row" hx-boost="true" hx-select="main" hx-target="main" hx-swap="outerHTML">
+            <li class="nav-item mx-1">
+              {{ with $clusterPackages := "clusterpackages" }}
+                <a
+                  class="nav-link {{ if eq $.NavbarActiveItem $clusterPackages }}active{{ end }}"
+                  href="/clusterpackages"
+                  >ClusterPackages</a
+                >
+              {{ end }}
+            </li>
+            <li class="nav-item mx-1">
+              {{ with $packages := "packages" }}
+                <a class="nav-link {{ if eq $.NavbarActiveItem $packages }}active{{ end }}" href="/packages"
+                  >Packages</a
+                >
+              {{ end }}
+            </li>
+            <li class="nav-item mx-1">
+              {{ with $settings := "settings" }}
+                <a class="nav-link {{ if eq $.NavbarActiveItem $settings }}active{{ end }}" href="/settings"
+                  >Settings</a
+                >
+              {{ end }}
+            </li>
+          </ul>
+        </div>
 
-        <div class="navbar-collapse">
-          <ul class="navbar-nav ms-auto align-items-center gap-1">
+        <div class="d-flex  flex-row align-items-center justify-content-around">
+          <ul class="navbar-nav ms-auto align-items-center gap-2 d-flex flex-row">
             <li class="nav-item">
               <a class="nav-link" href="https://glasskube.cloud/signup.html?id={{ .CloudId }}" target="_blank"
                 ><span class="bi bi-box-arrow-up-right me-1"></span>Glasskube Cloud</a
diff --git a/internal/web/templates/pages/clusterpackages.html b/internal/web/templates/pages/clusterpackages.html
new file mode 100644
index 000000000..6ee341a96
--- /dev/null
+++ b/internal/web/templates/pages/clusterpackages.html
@@ -0,0 +1,65 @@
+{{ define "content" }}
+  <!-- TODO why are we restoring main on historyRestore but only overview-swapped in sse ? -->
+  <div
+    class="container-lg my-2"
+    hx-trigger="htmx:historyRestore from:body"
+    hx-get="/clusterpackages"
+    hx-select="main"
+    hx-target="main"
+    hx-swap="outerHTML">
+    <div
+      class="m-0 p-0"
+      id="clusterpackage-overview-swapped"
+      hx-trigger="sse:refresh-clusterpackage-overview"
+      hx-get="/clusterpackages"
+      hx-swap="innerHTML"
+      hx-select="#clusterpackage-overview-swapped"
+      hx-target="#clusterpackage-overview-swapped">
+      {{ template "pkg-update-alert" . | ForPkgUpdateAlert }}
+      <div class="row row-cols-3 row-cols-xl-4 g-2">
+        {{ range .ClusterPackages }}
+          <div class="col">
+            <div class="card bg-body-secondary h-100 border-primary border-1">
+              <div class="card-body d-flex flex-column p-0">
+                <a
+                  class="flex-grow-1 d-flex align-items-center gap-1 text-reset text-decoration-none p-1"
+                  href="/clusterpackages/{{ .Name }}"
+                  hx-select="main"
+                  hx-target="main"
+                  hx-swap="outerHTML"
+                  hx-boost="true">
+                  <div class="flex-shrink-0 align-self-center">
+                    {{ if eq .IconUrl "" }}
+                      <!-- TODO the glasskube logo as fallback is probably not the best idea? -->
+                      <img
+                        src="/static/assets/glasskube-logo.svg"
+                        alt="{{ .Name }}"
+                        style="width: 3.25rem; height: auto;" />
+                    {{ else }}
+                      <img src="{{ .IconUrl }}" alt="{{ .Name }}" style="width: 3.25rem; height: auto;" />
+                    {{ end }}
+                  </div>
+                  <div class="flex-grow-1 align-self-start">
+                    <h6 class="text-reset m-0">{{ .Name }}</h6>
+                    <span
+                      class="lh-sm overflow-hidden"
+                      style="
+                        font-size: small;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 2;">
+                      {{ .ShortDescription }}
+                    </span>
+                  </div>
+                </a>
+                <div class="mb-1 mx-1">
+                  {{ template "clpkg-overview-btn" (ForClPkgOverviewBtn . (index $.ClusterPackageUpdateAvailable .Name)) }}
+                </div>
+              </div>
+            </div>
+          </div>
+        {{ end }}
+      </div>
+    </div>
+  </div>
+{{ end }}
diff --git a/internal/web/templates/pages/discussion.html b/internal/web/templates/pages/discussion.html
index 357a70b08..f91f57716 100644
--- a/internal/web/templates/pages/discussion.html
+++ b/internal/web/templates/pages/discussion.html
@@ -3,14 +3,14 @@
     <div
       class="container-lg mt-2"
       hx-trigger="htmx:historyRestore from:body"
-      hx-get="/packages/{{ .Manifest.Name }}/discussion"
+      hx-get="{{ .DiscussionHref }}"
       hx-select="main"
       hx-target="main"
       hx-swap="outerHTML">
       <div
         class="row p-3 col-lg-10 offset-lg-1"
         hx-trigger="sse:refresh-pkg-detail-{{ .Manifest.Name }}"
-        hx-get="/packages/{{ .Manifest.Name }}/discussion"
+        hx-get="{{ .DiscussionHref }}"
         hx-swap="outerHTML"
         hx-select="#pkg-detail-header-swapped"
         hx-target="#pkg-detail-header-swapped">
diff --git a/internal/web/templates/pages/package.html b/internal/web/templates/pages/package.html
index cb3799da2..9966849c8 100644
--- a/internal/web/templates/pages/package.html
+++ b/internal/web/templates/pages/package.html
@@ -3,7 +3,7 @@
     <div
       class="container-lg mt-2"
       hx-trigger="htmx:historyRestore from:body"
-      hx-get="/packages/{{ .Manifest.Name }}"
+      hx-get="{{ .PackageHref }}"
       hx-select="main"
       hx-target="main"
       hx-swap="outerHTML">
@@ -11,8 +11,8 @@
        otherwise during the time of swapping, a following event might not be able to trigger a new request -->
       <div
         class="row p-3 col-lg-10 offset-lg-1"
-        hx-trigger="sse:refresh-pkg-detail-{{ .Manifest.Name }}"
-        hx-get="/packages/{{ .Manifest.Name }}"
+        hx-trigger="sse:{{ PackageDetailRefreshId .Manifest .Package }}"
+        hx-get="{{ .PackageHref }}"
         hx-swap="outerHTML"
         hx-select="#pkg-detail-container-swapped"
         hx-target="#pkg-detail-container-swapped">
@@ -35,26 +35,8 @@ <h2 class="text-reset">Package Details</h2>
                 {{ end }}
               </i>
             {{ end }}
-
-            {{ if or (eq .Package nil) (IsUpgradable .Package.Spec.PackageInfo.Version .LatestVersion) }}
-              <div class="my-1">
-                <i>Latest version: {{ .LatestVersion }}</i>
-              </div>
-            {{ end }}
-            {{ if ne .Status nil }}
-              <div class="my-1">
-                <i>Installed version: {{ .Package.Spec.PackageInfo.Version }}</i>
-              </div>
-              <div class="my-1">
-                <i>Repository: {{ .Package.Spec.PackageInfo.RepositoryName }}</i>
-              </div>
-            {{ end }}
-            {{ if .AutoUpdate }}
-              <div class="my-1">
-                <i>Auto-Update: {{ .AutoUpdate }}</i>
-              </div>
-            {{ end }}
           </div>
+
           {{ if ne .Manifest.Dependencies nil }}
             <div class="mt-3">
               <h2 class="text-reset">Package Dependencies</h2>
@@ -81,7 +63,7 @@ <h2 class="text-reset">Package Dependencies</h2>
             <div
               class="visually-hidden"
               id="advanced-options"
-              hx-get="/packages/{{ .Manifest.Name }}/configure/advanced"
+              hx-get="{{ .PackageHref }}/configure/advanced"
               hx-swap="outerHTML"
               hx-target="this"
               hx-select="#advanced-options"
@@ -99,10 +81,12 @@ <h2 class="text-reset">
                 {{ end }}
               </h2>
 
+              <div id="configuration-error-container" class="mt-2"></div>
+
               <form
-                hx-post="/packages/{{ .Manifest.Name }}/configure"
-                hx-target="#error-container"
-                hx-target-error="#error-container"
+                hx-post="{{ .PackageHref }}/configure"
+                hx-target="#configuration-error-container"
+                hx-target-error="#configuration-error-container"
                 hx-select="div.alert"
                 hx-swap="innerHTML">
                 {{ if eq .Status nil }}
@@ -117,7 +101,7 @@ <h2 class="text-reset">
                         hx-select="main"
                         hx-swap="main"
                         hx-target="main"
-                        hx-get="/packages/{{ .Manifest.Name }}"
+                        hx-get="{{ .PackageHref }}"
                         hx-include="#pkg-install-version">
                         {{ range .Repositories }}
                           <option value="{{ .Name }}" {{ if eq .Name $.RepositoryName }}selected{{ end }}>
@@ -137,7 +121,7 @@ <h2 class="text-reset">
                       hx-select="main"
                       hx-swap="main"
                       hx-target="main"
-                      hx-get="/packages/{{ .Manifest.Name }}"
+                      hx-get="{{ .PackageHref }}"
                       hx-include="#pkg-install-repository">
                       {{ with $idx := .PackageIndex }}
                         {{ range $idx.Versions | Reversed }}
@@ -149,6 +133,25 @@ <h2 class="text-reset">
                       {{ end }}
                     </select>
                   </div>
+
+                  {{ if .Manifest.Scope.IsNamespaced }}
+                    <label class="form-label" for="pkg-install-namespace">Namespace</label>
+                    <div class="input-group mb-2">
+                      <input
+                        class="form-control"
+                        type="text"
+                        name="requestedNamespace"
+                        id="pkg-install-namespace"
+                        required />
+                    </div>
+
+                    <label class="form-label" for="pkg-install-name">Name</label>
+                    <div class="input-group mb-2">
+                      <input class="form-control" type="text" name="requestedName" id="pkg-install-name" required />
+                    </div>
+                  {{ end }}
+
+
                   <div class="form-check mt-1 mb-3">
                     <input class="form-check-input" type="checkbox" name="enableAutoUpdate" id="enable-auto-update" />
                     <label class="form-check-label ms-1" for="enable-auto-update">Auto Updates</label>
@@ -165,7 +168,7 @@ <h4 class="text-reset">Configuration</h4>
                       $.Package
                       $.RepositoryName
                       $.SelectedVersion
-                      $.Manifest.Name
+                      $.Manifest
                       $valName
                       $valDef
                       (index $.ValueErrors $valName)
diff --git a/internal/web/templates/pages/packages.html b/internal/web/templates/pages/packages.html
index d297a1d1b..2840ba586 100644
--- a/internal/web/templates/pages/packages.html
+++ b/internal/web/templates/pages/packages.html
@@ -8,57 +8,180 @@
     hx-swap="outerHTML">
     <div
       class="m-0 p-0"
-      id="pkgs-container-swapped"
-      hx-trigger="sse:refresh-pkg-overview"
+      id="package-overview-swapped"
+      hx-trigger="sse:refresh-package-overview"
       hx-get="/packages"
       hx-swap="innerHTML"
-      hx-select="#pkgs-container-swapped"
-      hx-target="#pkgs-container-swapped">
+      hx-select="#package-overview-swapped"
+      hx-target="#package-overview-swapped">
       {{ template "pkg-update-alert" . | ForPkgUpdateAlert }}
-      <div class="row row-cols-3 row-cols-xl-4 g-2">
-        {{ range .Packages }}
-          <div class="col">
-            <div class="card bg-body-secondary h-100 border-primary border-1">
-              <div class="card-body d-flex flex-column p-0">
-                <a
-                  class="flex-grow-1 d-flex align-items-center gap-1 text-reset text-decoration-none p-1"
-                  href="/packages/{{ .Name }}"
-                  hx-select="main"
-                  hx-target="main"
-                  hx-swap="outerHTML"
-                  hx-boost="true">
-                  <div class="flex-shrink-0 align-self-center">
-                    {{ if eq .IconUrl "" }}
-                      <!-- TODO the glasskube logo as fallback is probably not the best idea? -->
-                      <img
-                        src="/static/assets/glasskube-logo.svg"
-                        alt="{{ .Name }}"
-                        style="width: 3.25rem; height: auto;" />
-                    {{ else }}
-                      <img src="{{ .IconUrl }}" alt="{{ .Name }}" style="width: 3.25rem; height: auto;" />
-                    {{ end }}
-                  </div>
-                  <div class="flex-grow-1 align-self-start">
-                    <h6 class="text-reset m-0">{{ .Name }}</h6>
-                    <span
-                      class="lh-sm overflow-hidden"
-                      style="
+      <div class="row row-cols-1 g-2">
+        <div>
+          <h2 class="text-reset">Installed Packages</h2>
+
+          {{ if eq (len .InstalledPackages) 0 }}
+            <p>No packages installed yet in your cluster. You might want to try one of the packages below.</p>
+          {{ end }}
+
+          {{ range .InstalledPackages }}
+            <div class="col mt-2">
+              <div class="card bg-body-secondary h-100 border-primary border-1">
+                <div class="card-body d-flex flex-column p-1">
+                  <span class="flex-grow-1 d-flex align-items-center gap-1 text-reset text-decoration-none p-1">
+                    <div class="flex-shrink-0 align-self-center">
+                      {{ if eq .IconUrl "" }}
+                        <!-- TODO the glasskube logo as fallback is probably not the best idea? -->
+                        <img
+                          src="/static/assets/glasskube-logo.svg"
+                          alt="{{ .Name }}"
+                          style="width: 3.25rem; height: auto;" />
+                      {{ else }}
+                        <img src="{{ .IconUrl }}" alt="{{ .Name }}" style="width: 2rem; height: auto;" />
+                      {{ end }}
+                    </div>
+                    <div class="flex-grow-1 align-self-start">
+                      <h6 class="text-reset m-0">{{ .Name }}</h6>
+                      <span
+                        class="lh-sm overflow-hidden"
+                        style="
                         font-size: small;
                         display: -webkit-box;
                         -webkit-box-orient: vertical;
                         -webkit-line-clamp: 2;">
-                      {{ .ShortDescription }}
+                        {{ .ShortDescription }}
+                      </span>
+                    </div>
+
+                    <span class="align-self-center mx-auto">
+                      <a
+                        href="/packages/{{ .Name }}#configuration"
+                        class="flex-grow-1 d-flex align-items-center gap-1 btn btn-primary btn-sm"
+                        hx-select="main"
+                        hx-target="main"
+                        hx-swap="outerHTML"
+                        hx-boost="true"
+                        >Install</a
+                      >
                     </span>
-                  </div>
-                </a>
-                <div class="mb-1 mx-1">
-                  {{ template "pkg-overview-btn" ForPkgOverviewBtn . (index $.PackageUpdateAvailable .Name) }}
+                  </span>
+
+                  <table class="table table-sm table-borderless m-0 ms-1">
+                    <thead>
+                      <tr>
+                        <th scope="col" class="bg-body-secondary p-0">Name</th>
+                        <th scope="col" class="bg-body-secondary p-0">Namespace</th>
+                        <th scope="col" class="bg-body-secondary p-0">Repository</th>
+                        <th scope="col" class="bg-body-secondary p-0">Version</th>
+                        <th scope="col" class="bg-body-secondary p-0">Status</th>
+                        <th scope="col" class="bg-body-secondary p-0"></th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {{ range .Packages }}
+                        <tr>
+                          <td class="bg-body-secondary p-0">
+                            <a
+                              href="/packages/{{ .Name }}/{{ .Package.Namespace }}/{{ .Package.Name }}"
+                              class="text-reset"
+                              hx-select="main"
+                              hx-target="main"
+                              hx-swap="outerHTML"
+                              hx-boost="true">
+                              {{ .Package.Name }}
+                            </a>
+                          </td>
+                          <td class="bg-body-secondary p-0">{{ .Package.Namespace }}</td>
+                          <td class="bg-body-secondary p-0">{{ .Package.Spec.PackageInfo.RepositoryName }}</td>
+                          <td class="bg-body-secondary p-0">{{ .Package.Spec.PackageInfo.Version }}</td>
+                          <td class="bg-body-secondary p-0">{{ .Status.Status }}</td>
+                          <td class="bg-body-secondary p-0 pe-2 text-end">
+                            <a
+                              href="/packages/{{ .Name }}/{{ .Package.Namespace }}/{{ .Package.Name }}"
+                              class="px-1 py-0 btn btn-sm btn-outline-primary fw-normal border-1"
+                              hx-select="main"
+                              hx-target="main"
+                              hx-swap="outerHTML"
+                              hx-boost="true">
+                              <i class="bi bi-gear-fill me-1"></i>Configure
+                            </a>
+                          </td>
+                        </tr>
+                      {{ end }}
+                    </tbody>
+                  </table>
                 </div>
               </div>
             </div>
+          {{ end }}
+        </div>
+
+        {{ if or (ne (len .AvailablePackages) 0) (eq (len .InstalledPackages) 0) }}
+          <div class="mt-3">
+            <h2 class="text-reset">Available Packages</h2>
+
+            {{ if and (eq (len .AvailablePackages) 0) (eq (len .InstalledPackages) 0) }}
+              <p>No packages are available right now.</p>
+            {{ end }}
+            <div class="row row-cols-3 row-cols-xl-4 g-2">
+              {{ range .AvailablePackages }}
+                <!-- TODO make this a reusable template -->
+                <div class="col">
+                  <div class="card bg-body-secondary h-100 border-primary border-1">
+                    <div class="card-body d-flex flex-column p-0">
+                      <a
+                        class="flex-grow-1 d-flex align-items-center gap-1 text-reset text-decoration-none p-1"
+                        href="/packages/{{ .Name }}"
+                        hx-select="main"
+                        hx-target="main"
+                        hx-swap="outerHTML"
+                        hx-boost="true">
+                        <div class="flex-shrink-0 align-self-center">
+                          {{ if eq .IconUrl "" }}
+                            <!-- TODO the glasskube logo as fallback is probably not the best idea? -->
+                            <img
+                              src="/static/assets/glasskube-logo.svg"
+                              alt="{{ .Name }}"
+                              style="width: 3.25rem; height: auto;" />
+                          {{ else }}
+                            <img src="{{ .IconUrl }}" alt="{{ .Name }}" style="width: 3.25rem; height: auto;" />
+                          {{ end }}
+                        </div>
+                        <div class="flex-grow-1 align-self-start">
+                          <h6 class="text-reset m-0">{{ .Name }}</h6>
+                          <span
+                            class="lh-sm overflow-hidden"
+                            style="
+                        font-size: small;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 2;">
+                            {{ .ShortDescription }}
+                          </span>
+                        </div>
+                      </a>
+                      <div class="mb-1 mx-1">
+                        <a
+                          href="/packages/{{ .Name }}#configuration"
+                          hx-boost="true"
+                          hx-select="main"
+                          hx-target="main"
+                          hx-swap="outerHTML"
+                          class="btn btn-primary btn-sm w-100"
+                          >Install</a
+                        >
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              {{ end }}
+            </div>
           </div>
         {{ end }}
       </div>
     </div>
   </div>
 {{ end }}
+
+{{ define "installed-pkg-table-cell" }}
+
+{{ end }}
diff --git a/internal/web/util/packagehref.go b/internal/web/util/packagehref.go
new file mode 100644
index 000000000..73a8fddb5
--- /dev/null
+++ b/internal/web/util/packagehref.go
@@ -0,0 +1,41 @@
+package util
+
+import (
+	"fmt"
+
+	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+)
+
+func GetPackageHref(pkg ctrlpkg.Package, manifest *v1alpha1.PackageManifest) string {
+	return getPackageHref(pkg, manifest, false)
+}
+
+func GetPackageHrefWithFallback(pkg ctrlpkg.Package, manifest *v1alpha1.PackageManifest) string {
+	return getPackageHref(pkg, manifest, true)
+}
+
+func getPackageHref(pkg ctrlpkg.Package, manifest *v1alpha1.PackageManifest, withFallback bool) string {
+	if manifest.Scope.IsCluster() {
+		return GetClusterPkgHref(manifest.Name)
+	} else {
+		if !pkg.IsNil() {
+			return GetNamespacedPkgHref(manifest.Name, pkg.GetNamespace(), pkg.GetName())
+		} else if withFallback {
+			return GetNamespacedPkgHref(manifest.Name, "-", "-") // not installed yet
+		}
+		return GetNamespacedPkgHref(manifest.Name, "", "")
+	}
+}
+
+func GetClusterPkgHref(pkgName string) string {
+	return fmt.Sprintf("/clusterpackages/%s", pkgName)
+}
+
+func GetNamespacedPkgHref(manifestName string, namespace string, name string) string {
+	if namespace != "" && name != "" {
+		return fmt.Sprintf("/packages/%s/%s/%s", manifestName, namespace, name)
+	} else {
+		return fmt.Sprintf("/packages/%s", manifestName)
+	}
+}
diff --git a/internal/webhook/package_validator_test.go b/internal/webhook/package_validator_test.go
index 063c105eb..c953ecbab 100644
--- a/internal/webhook/package_validator_test.go
+++ b/internal/webhook/package_validator_test.go
@@ -222,14 +222,13 @@ var _ = Describe("PackageValidatingWebhook", Ordered, func() {
 				Expect(err).To(HaveOccurred())
 			})
 		})
-		// TODO re-enable
-		/*When("a namespaced dependent exists with constraint", func() {
+		When("a namespaced dependent exists with constraint", func() {
 			It("should return error", func(ctx context.Context) {
 				webhook := newPackageValidatingWebhook(&nspv1pkg, &nspv1pi, &foov1pkg, &foov1pi)
 				_, err := webhook.ValidateUpdate(ctx, &foov1pkg, &foov2pkg)
 				Expect(err).To(HaveOccurred())
 			})
-		})*/
+		})
 	})
 
 	Context("ValidateDelete", func() {
diff --git a/package-lock.json b/package-lock.json
index aef6db7c1..dc036af57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
       "devDependencies": {
         "@commitlint/cli": "19.3.0",
         "@commitlint/config-conventional": "19.2.2",
-        "esbuild": "0.21.5",
+        "esbuild": "0.22.0",
         "prettier": "3.3.2",
         "prettier-plugin-go-template": "0.0.15"
       }
@@ -380,9 +380,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.22.0.tgz",
+      "integrity": "sha512-uvQR2crZ/zgzSHDvdygHyNI+ze9zwS8mqz0YtGXotSqvEE0UkYE9s+FZKQNTt1VtT719mfP3vHrUdCpxBNQZhQ==",
       "cpu": [
         "ppc64"
       ],
@@ -393,13 +393,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.22.0.tgz",
+      "integrity": "sha512-PBnyP+r8vJE4ifxsWys9l+Mc2UY/yYZOpX82eoyGISXXb3dRr0M21v+s4fgRKWMFPMSf/iyowqPW/u7ScSUkjQ==",
       "cpu": [
         "arm"
       ],
@@ -410,13 +410,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.22.0.tgz",
+      "integrity": "sha512-UKhPb3o2gAB/bfXcl58ZXTn1q2oVu1rEu/bKrCtmm+Nj5MKUbrOwR5WAixE2v+lk0amWuwPvhnPpBRLIGiq7ig==",
       "cpu": [
         "arm64"
       ],
@@ -427,13 +427,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.22.0.tgz",
+      "integrity": "sha512-IjTYtvIrjhR41Ijy2dDPgYjQHWG/x/A4KXYbs1fiU3efpRdoxMChK3oEZV6GPzVEzJqxFgcuBaiX1kwEvWUxSw==",
       "cpu": [
         "x64"
       ],
@@ -444,13 +444,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.22.0.tgz",
+      "integrity": "sha512-mqt+Go4y9wRvEz81bhKd9RpHsQR1LwU8Xm6jZRUV/xpM7cIQFbFH6wBCLPTNsdELBvfoHeumud7X78jQQJv2TA==",
       "cpu": [
         "arm64"
       ],
@@ -461,13 +461,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.22.0.tgz",
+      "integrity": "sha512-vTaTQ9OgYc3VTaWtOE5pSuDT6H3d/qSRFRfSBbnxFfzAvYoB3pqKXA0LEbi/oT8GUOEAutspfRMqPj2ezdFaMw==",
       "cpu": [
         "x64"
       ],
@@ -478,13 +478,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.22.0.tgz",
+      "integrity": "sha512-0e1ZgoobJzaGnR4reD7I9rYZ7ttqdh1KPvJWnquUoDJhL0rYwdneeLailBzd2/4g/U5p4e5TIHEWa68NF2hFpQ==",
       "cpu": [
         "arm64"
       ],
@@ -495,13 +495,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.22.0.tgz",
+      "integrity": "sha512-BFgyYwlCwRWyPQJtkzqq2p6pJbiiWgp0P9PNf7a5FQ1itKY4czPuOMAlFVItirSmEpRPCeImuwePNScZS0pL5Q==",
       "cpu": [
         "x64"
       ],
@@ -512,13 +512,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.22.0.tgz",
+      "integrity": "sha512-KEMWiA9aGuPUD4BH5yjlhElLgaRXe+Eri6gKBoDazoPBTo1BXc/e6IW5FcJO9DoL19FBeCxgONyh95hLDNepIg==",
       "cpu": [
         "arm"
       ],
@@ -529,13 +529,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.22.0.tgz",
+      "integrity": "sha512-V/K2rctCUgC0PCXpN7AqT4hoazXKgIYugFGu/myk2+pfe6jTW2guz/TBwq4cZ7ESqusR/IzkcQaBkcjquuBWsw==",
       "cpu": [
         "arm64"
       ],
@@ -546,13 +546,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.22.0.tgz",
+      "integrity": "sha512-r2ZZqkOMOrpUhzNwxI7uLAHIDwkfeqmTnrv1cjpL/rjllPWszgqmprd/om9oviKXUBpMqHbXmppvjAYgISb26Q==",
       "cpu": [
         "ia32"
       ],
@@ -563,13 +563,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.22.0.tgz",
+      "integrity": "sha512-qaowLrV/YOMAL2RfKQ4C/VaDzAuLDuylM2sd/LH+4OFirMl6CuDpRlCq4u49ZBaVV8pkI/Y+hTdiibvQRhojCA==",
       "cpu": [
         "loong64"
       ],
@@ -580,13 +580,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.22.0.tgz",
+      "integrity": "sha512-hgrezzjQTRxjkQ5k08J6rtZN5PNnkWx/Rz6Kmj9gnsdCAX1I4Dn4ZPqvFRkXo55Q3pnVQJBwbdtrTO7tMGtyVA==",
       "cpu": [
         "mips64el"
       ],
@@ -597,13 +597,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.22.0.tgz",
+      "integrity": "sha512-ewxg6FLLUio883XgSjfULEmDl3VPv/TYNnRprVAS3QeGFLdCYdx1tIudBcd7n9jIdk82v1Ajov4jx87qW7h9+g==",
       "cpu": [
         "ppc64"
       ],
@@ -614,13 +614,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.22.0.tgz",
+      "integrity": "sha512-Az5XbgSJC2lE8XK8pdcutsf9RgdafWdTpUK/+6uaDdfkviw/B4JCwAfh1qVeRWwOohwdsl4ywZrWBNWxwrPLFg==",
       "cpu": [
         "riscv64"
       ],
@@ -631,13 +631,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.22.0.tgz",
+      "integrity": "sha512-8j4a2ChT9+V34NNNY9c/gMldutaJFmfMacTPq4KfNKwv2fitBCLYjee7c+Vxaha2nUhPK7cXcZpJtJ3+Y7ZdVQ==",
       "cpu": [
         "s390x"
       ],
@@ -648,13 +648,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.22.0.tgz",
+      "integrity": "sha512-JUQyOnpbAkkRFOk/AhsEemz5TfWN4FJZxVObUlnlNCbe7QBl61ZNfM4cwBXayQA6laMJMUcqLHaYQHAB6YQ95Q==",
       "cpu": [
         "x64"
       ],
@@ -665,13 +665,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.22.0.tgz",
+      "integrity": "sha512-11PoCoHXo4HFNbLsXuMB6bpMPWGDiw7xETji6COdJss4SQZLvcgNoeSqWtATRm10Jj1uEHiaIk4N0PiN6x4Fcg==",
       "cpu": [
         "x64"
       ],
@@ -682,13 +682,30 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.22.0.tgz",
+      "integrity": "sha512-Ezlhu/YyITmXwKSB+Zu/QqD7cxrjrpiw85cc0Rbd3AWr2wsgp+dWbWOE8MqHaLW9NKMZvuL0DhbJbvzR7F6Zvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.22.0.tgz",
+      "integrity": "sha512-ufjdW5tFJGUjlH9j/5cCE9lrwRffyZh+T4vYvoDKoYsC6IXbwaFeV/ENxeNXcxotF0P8CDzoICXVSbJaGBhkrw==",
       "cpu": [
         "x64"
       ],
@@ -699,13 +716,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.22.0.tgz",
+      "integrity": "sha512-zY6ly/AoSmKnmNTowDJsK5ehra153/5ZhqxNLfq9NRsTTltetr+yHHcQ4RW7QDqw4JC8A1uC1YmeSfK9NRcK1w==",
       "cpu": [
         "x64"
       ],
@@ -716,13 +733,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.22.0.tgz",
+      "integrity": "sha512-Kml5F7tv/1Maam0pbbCrvkk9vj046dPej30kFzlhXnhuCtYYBP6FGy/cLbc5yUT1lkZznGLf2OvuvmLjscO5rw==",
       "cpu": [
         "arm64"
       ],
@@ -733,13 +750,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.22.0.tgz",
+      "integrity": "sha512-IOgwn+mYTM3RrcydP4Og5IpXh+ftN8oF+HELTXSmbWBlujuci4Qa3DTeO+LEErceisI7KUSfEIiX+WOUlpELkw==",
       "cpu": [
         "ia32"
       ],
@@ -750,13 +767,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.22.0.tgz",
+      "integrity": "sha512-4bDHJrk2WHBXJPhy1y80X7/5b5iZTZP3LGcKIlAP1J+KqZ4zQAPMLEzftGyjjfcKbA4JDlPt/+2R/F1ZTeRgrw==",
       "cpu": [
         "x64"
       ],
@@ -767,7 +784,7 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@fontsource/inter": {
@@ -1117,9 +1134,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.22.0.tgz",
+      "integrity": "sha512-zNYA6bFZsVnsU481FnGAQjLDW0Pl/8BGG7EvAp15RzUvGC+ME7hf1q7LvIfStEQBz/iEHuBJCYcOwPmNCf1Tlw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1127,32 +1144,33 @@
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
+        "@esbuild/aix-ppc64": "0.22.0",
+        "@esbuild/android-arm": "0.22.0",
+        "@esbuild/android-arm64": "0.22.0",
+        "@esbuild/android-x64": "0.22.0",
+        "@esbuild/darwin-arm64": "0.22.0",
+        "@esbuild/darwin-x64": "0.22.0",
+        "@esbuild/freebsd-arm64": "0.22.0",
+        "@esbuild/freebsd-x64": "0.22.0",
+        "@esbuild/linux-arm": "0.22.0",
+        "@esbuild/linux-arm64": "0.22.0",
+        "@esbuild/linux-ia32": "0.22.0",
+        "@esbuild/linux-loong64": "0.22.0",
+        "@esbuild/linux-mips64el": "0.22.0",
+        "@esbuild/linux-ppc64": "0.22.0",
+        "@esbuild/linux-riscv64": "0.22.0",
+        "@esbuild/linux-s390x": "0.22.0",
+        "@esbuild/linux-x64": "0.22.0",
+        "@esbuild/netbsd-x64": "0.22.0",
+        "@esbuild/openbsd-arm64": "0.22.0",
+        "@esbuild/openbsd-x64": "0.22.0",
+        "@esbuild/sunos-x64": "0.22.0",
+        "@esbuild/win32-arm64": "0.22.0",
+        "@esbuild/win32-ia32": "0.22.0",
+        "@esbuild/win32-x64": "0.22.0"
       }
     },
     "node_modules/escalade": {
diff --git a/package.json b/package.json
index 0cdc914cd..9c288f1d9 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@commitlint/cli": "19.3.0",
     "@commitlint/config-conventional": "19.2.2",
-    "esbuild": "0.21.5",
+    "esbuild": "0.22.0",
     "prettier": "3.3.2",
     "prettier-plugin-go-template": "0.0.15"
   },
diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go
index be8dbe6ed..d653abad6 100644
--- a/pkg/bootstrap/bootstrap.go
+++ b/pkg/bootstrap/bootstrap.go
@@ -46,10 +46,16 @@ type BootstrapOptions struct {
 	DisableTelemetry        bool
 	Force                   bool
 	CreateDefaultRepository bool
+	DryRun                  bool
 }
 
 func DefaultOptions() BootstrapOptions {
-	return BootstrapOptions{Type: BootstrapTypeAio, Latest: config.IsDevBuild(), CreateDefaultRepository: true}
+	return BootstrapOptions{
+		Type:                    BootstrapTypeAio,
+		Latest:                  config.IsDevBuild(),
+		CreateDefaultRepository: true,
+		DryRun:                  false,
+	}
 }
 
 const installMessage = `
@@ -135,7 +141,7 @@ func (c *BootstrapClient) Bootstrap(
 
 	statusMessage("Applying Glasskube manifests", true)
 
-	if err = c.applyManifests(ctx, manifests); err != nil {
+	if err = c.applyManifests(ctx, manifests, options); err != nil {
 		telemetry.BootstrapFailure(time.Since(start))
 		statusMessage(fmt.Sprintf("Couldn't apply manifests: %v", err), false)
 		return nil, err
@@ -193,7 +199,11 @@ func (c *BootstrapClient) preprocessManifests(
 	return compositeErr
 }
 
-func (c *BootstrapClient) applyManifests(ctx context.Context, objs []unstructured.Unstructured) error {
+func (c *BootstrapClient) applyManifests(
+	ctx context.Context,
+	objs []unstructured.Unstructured,
+	options BootstrapOptions,
+) error {
 	bar := progressbar.Default(int64(len(objs)), "Applying manifests")
 	progressbar.OptionClearOnFinish()(bar)
 	progressbar.OptionOnCompletion(nil)(bar)
@@ -204,16 +214,17 @@ func (c *BootstrapClient) applyManifests(ctx context.Context, objs []unstructure
 		gvk := obj.GroupVersionKind()
 		mapping, err := c.mapper.RESTMapping(gvk.GroupKind(), gvk.Version)
 		if err != nil {
-			return fmt.Errorf("could not get restmapping for %v %v: %w", obj.GetKind(), obj.GetName(), err)
+			if options.DryRun {
+				continue
+			} else {
+				return fmt.Errorf("could not get restmapping for %v %v: %w", obj.GetKind(), obj.GetName(), err)
+			}
 		}
 
 		bar.Describe(fmt.Sprintf("Applying %v (%v)", obj.GetName(), obj.GetKind()))
 		if obj.GetKind() == "Job" {
-			options := metav1.DeletePropagationBackground
-			err := c.client.Resource(mapping.Resource).Namespace(obj.GetNamespace()).Delete(
-				ctx,
-				obj.GetName(),
-				metav1.DeleteOptions{PropagationPolicy: &options})
+			err := c.client.Resource(mapping.Resource).Namespace(obj.GetNamespace()).
+				Delete(ctx, obj.GetName(), getDeleteOptions(options))
 			if err != nil && !apierrors.IsNotFound(err) {
 				return err
 			}
@@ -221,13 +232,13 @@ func (c *BootstrapClient) applyManifests(ctx context.Context, objs []unstructure
 
 		if err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
 			_, err = c.client.Resource(mapping.Resource).Namespace(obj.GetNamespace()).
-				Apply(ctx, obj.GetName(), &obj, metav1.ApplyOptions{Force: true, FieldManager: "glasskube"})
+				Apply(ctx, obj.GetName(), &obj, getApplyOptions(options))
 			return err
-		}); err != nil {
+		}); err != nil && (!options.DryRun || !apierrors.IsNotFound(err)) {
 			return err
 		}
 
-		if obj.GetKind() == constants.Deployment {
+		if obj.GetKind() == constants.Deployment && !options.DryRun {
 			checkWorkloads = append(checkWorkloads, &objs[i])
 			bar.ChangeMax(bar.GetMax() + 1)
 		} else if obj.GetKind() == "CustomResourceDefinition" {
@@ -247,9 +258,28 @@ func (c *BootstrapClient) applyManifests(ctx context.Context, objs []unstructure
 		}
 		_ = bar.Add(1)
 	}
+
 	return nil
 }
 
+func getApplyOptions(options BootstrapOptions) metav1.ApplyOptions {
+	applyOptions := metav1.ApplyOptions{Force: true, FieldManager: "glasskube"}
+	if options.DryRun {
+		applyOptions.DryRun = []string{metav1.DryRunAll}
+	}
+	return applyOptions
+}
+
+func getDeleteOptions(options BootstrapOptions) metav1.DeleteOptions {
+	deleteOptions := metav1.DeleteOptions{
+		PropagationPolicy: util.Pointer(metav1.DeletePropagationBackground),
+	}
+	if options.DryRun {
+		deleteOptions.DryRun = []string{metav1.DryRunAll}
+	}
+	return deleteOptions
+}
+
 func (c *BootstrapClient) handleTelemetry(disabled bool, elapsed time.Duration) {
 	if !disabled {
 		statusMessage("Telemetry is enabled for this cluster – "+
diff --git a/pkg/bootstrap/type.go b/pkg/bootstrap/type.go
index 3ef4f5df4..1a4ad847b 100644
--- a/pkg/bootstrap/type.go
+++ b/pkg/bootstrap/type.go
@@ -27,5 +27,5 @@ func (t *BootstrapType) Set(v string) error {
 }
 
 func (e *BootstrapType) Type() string {
-	return fmt.Sprintf("[%v|%v]", BootstrapTypeAio, BootstrapTypeSlim)
+	return fmt.Sprintf("(%v|%v)", BootstrapTypeAio, BootstrapTypeSlim)
 }
diff --git a/pkg/client/builder.go b/pkg/client/builder.go
index df7daeccc..708ea95f9 100644
--- a/pkg/client/builder.go
+++ b/pkg/client/builder.go
@@ -2,19 +2,21 @@ package client
 
 import (
 	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type packageBuilder struct {
-	name, version, repositoryName string
-	autoUpdate                    bool
-	values                        map[string]v1alpha1.ValueConfiguration
+	manifestName, version, repositoryName string
+	namespace, name                       string
+	autoUpdate                            bool
+	values                                map[string]v1alpha1.ValueConfiguration
 }
 
-func ClusterPackageBuilder(name string) *packageBuilder {
+func PackageBuilder(name string) *packageBuilder {
 	return &packageBuilder{
-		name:   name,
-		values: make(map[string]v1alpha1.ValueConfiguration),
+		manifestName: name,
+		values:       make(map[string]v1alpha1.ValueConfiguration),
 	}
 }
 
@@ -33,6 +35,16 @@ func (b *packageBuilder) WithRepositoryName(repositoryName string) *packageBuild
 	return b
 }
 
+func (b *packageBuilder) WithNamespace(namespace string) *packageBuilder {
+	b.namespace = namespace
+	return b
+}
+
+func (b *packageBuilder) WithName(name string) *packageBuilder {
+	b.name = name
+	return b
+}
+
 func (b *packageBuilder) WithValues(values map[string]v1alpha1.ValueConfiguration) *packageBuilder {
 	for name, value := range values {
 		b.values[name] = value
@@ -40,14 +52,14 @@ func (b *packageBuilder) WithValues(values map[string]v1alpha1.ValueConfiguratio
 	return b
 }
 
-func (b *packageBuilder) Build() *v1alpha1.ClusterPackage {
+func (b *packageBuilder) BuildClusterPackage() *v1alpha1.ClusterPackage {
 	pkg := v1alpha1.ClusterPackage{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: b.name,
+			Name: b.manifestName,
 		},
 		Spec: v1alpha1.PackageSpec{
 			PackageInfo: v1alpha1.PackageInfoTemplate{
-				Name:           b.name,
+				Name:           b.manifestName,
 				Version:        b.version,
 				RepositoryName: b.repositoryName,
 			},
@@ -57,3 +69,30 @@ func (b *packageBuilder) Build() *v1alpha1.ClusterPackage {
 	pkg.SetAutoUpdatesEnabled(b.autoUpdate)
 	return &pkg
 }
+
+func (b *packageBuilder) BuildPackage() *v1alpha1.Package {
+	pkg := v1alpha1.Package{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      b.name,
+			Namespace: b.namespace,
+		},
+		Spec: v1alpha1.PackageSpec{
+			PackageInfo: v1alpha1.PackageInfoTemplate{
+				Name:           b.manifestName,
+				Version:        b.version,
+				RepositoryName: b.repositoryName,
+			},
+			Values: b.values,
+		},
+	}
+	pkg.SetAutoUpdatesEnabled(b.autoUpdate)
+	return &pkg
+}
+
+func (b *packageBuilder) Build(scope *v1alpha1.PackageScope) ctrlpkg.Package {
+	if scope.IsCluster() {
+		return b.BuildClusterPackage()
+	} else {
+		return b.BuildPackage()
+	}
+}
diff --git a/pkg/client/client_base.go b/pkg/client/client_base.go
index b16e1c1f8..280e939e8 100644
--- a/pkg/client/client_base.go
+++ b/pkg/client/client_base.go
@@ -35,12 +35,14 @@ func (c *baseClientset) PackageRepositories() PackageRepositoryInterface {
 
 func (c *baseClientset) WithStores(
 	clusterPackageStore cache.Store,
+	packageStore cache.Store,
 	packageInfoStore cache.Store,
 	packageRepositoryStore cache.Store,
 ) PackageV1Alpha1Client {
 	return &cacheClientset{
 		PackageV1Alpha1Client:  c,
 		clusterPackageStore:    clusterPackageStore,
+		packageStore:           packageStore,
 		packageInfoStore:       packageInfoStore,
 		packageRepositoryStore: packageRepositoryStore,
 	}
diff --git a/pkg/client/client_cached.go b/pkg/client/client_cached.go
index 90e2bd63d..bb2ff2821 100644
--- a/pkg/client/client_cached.go
+++ b/pkg/client/client_cached.go
@@ -3,6 +3,8 @@ package client
 import (
 	"context"
 	"errors"
+	"fmt"
+	"slices"
 
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -14,6 +16,7 @@ import (
 type cacheClientset struct {
 	PackageV1Alpha1Client
 	clusterPackageStore    cache.Store
+	packageStore           cache.Store
 	packageInfoStore       cache.Store
 	packageRepositoryStore cache.Store
 }
@@ -24,26 +27,44 @@ func (c *cacheClientset) ClusterPackages() ClusterPackageInterface {
 		return p
 	}
 	return &readWriteCacheClient[v1alpha1.ClusterPackage, v1alpha1.ClusterPackageList]{
-		p,
-		readOnlyCacheClient[v1alpha1.ClusterPackage, v1alpha1.ClusterPackageList]{
-			p,
-			c.clusterPackageStore,
-			func(items []v1alpha1.ClusterPackage) v1alpha1.ClusterPackageList {
+		fallback: p,
+		readOnlyCacheClient: readOnlyCacheClient[v1alpha1.ClusterPackage, v1alpha1.ClusterPackageList]{
+			fallback: p,
+			store:    c.clusterPackageStore,
+			listFactory: func(items []v1alpha1.ClusterPackage) v1alpha1.ClusterPackageList {
 				return v1alpha1.ClusterPackageList{Items: items}
 			},
 		},
 	}
 }
 
+func (c *cacheClientset) Packages(ns string) PackageInterface {
+	p := c.PackageV1Alpha1Client.Packages(ns)
+	if c.packageStore == nil {
+		return p
+	}
+	return &readWriteCacheClient[v1alpha1.Package, v1alpha1.PackageList]{
+		fallback: p,
+		readOnlyCacheClient: readOnlyCacheClient[v1alpha1.Package, v1alpha1.PackageList]{
+			fallback: p,
+			store:    c.packageStore,
+			listFactory: func(items []v1alpha1.Package) v1alpha1.PackageList {
+				return v1alpha1.PackageList{Items: items}
+			},
+			namespace: ns,
+		},
+	}
+}
+
 func (c *cacheClientset) PackageInfos() PackageInfoInterface {
 	pi := c.PackageV1Alpha1Client.PackageInfos()
 	if c.packageInfoStore == nil {
 		return pi
 	}
 	return &readOnlyCacheClient[v1alpha1.PackageInfo, v1alpha1.PackageInfoList]{
-		pi,
-		c.packageInfoStore,
-		func(items []v1alpha1.PackageInfo) v1alpha1.PackageInfoList {
+		fallback: pi,
+		store:    c.packageInfoStore,
+		listFactory: func(items []v1alpha1.PackageInfo) v1alpha1.PackageInfoList {
 			return v1alpha1.PackageInfoList{Items: items}
 		},
 	}
@@ -55,11 +76,11 @@ func (c *cacheClientset) PackageRepositories() PackageRepositoryInterface {
 		return pr
 	}
 	return &readWriteCacheClient[v1alpha1.PackageRepository, v1alpha1.PackageRepositoryList]{
-		pr,
-		readOnlyCacheClient[v1alpha1.PackageRepository, v1alpha1.PackageRepositoryList]{
-			pr,
-			c.packageRepositoryStore,
-			func(items []v1alpha1.PackageRepository) v1alpha1.PackageRepositoryList {
+		fallback: pr,
+		readOnlyCacheClient: readOnlyCacheClient[v1alpha1.PackageRepository, v1alpha1.PackageRepositoryList]{
+			fallback: pr,
+			store:    c.packageRepositoryStore,
+			listFactory: func(items []v1alpha1.PackageRepository) v1alpha1.PackageRepositoryList {
 				return v1alpha1.PackageRepositoryList{Items: items}
 			},
 		},
@@ -70,6 +91,11 @@ type readOnlyCacheClient[T any, L any] struct {
 	fallback    readOnlyClientInterface[T, L]
 	store       cache.Store
 	listFactory func(items []T) L
+	namespace   string
+}
+
+func getKey(namespace, name string) string {
+	return cache.NewObjectName(namespace, name).String()
 }
 
 func (c *readOnlyCacheClient[T, L]) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
@@ -77,7 +103,7 @@ func (c *readOnlyCacheClient[T, L]) Watch(ctx context.Context, opts metav1.ListO
 }
 
 func (c *readOnlyCacheClient[T, L]) Get(ctx context.Context, name string, target *T) error {
-	if obj, ok, err := c.store.GetByKey(name); err != nil {
+	if obj, ok, err := c.store.GetByKey(getKey(c.namespace, name)); err != nil {
 		return apierrors.NewInternalError(err)
 	} else if !ok {
 		return c.fallback.Get(ctx, name, target)
@@ -90,10 +116,23 @@ func (c *readOnlyCacheClient[T, L]) Get(ctx context.Context, name string, target
 }
 
 func (c *readOnlyCacheClient[T, L]) GetAll(ctx context.Context, target *L) error {
-	objs := c.store.List()
-	items := make([]T, len(objs))
-	for i, obj := range objs {
-		if obj, ok := obj.(*T); !ok {
+	keys := c.store.ListKeys()
+	slices.Sort(keys)
+	items := make([]T, len(keys))
+	for i, key := range keys {
+		if c.namespace != "" {
+			if objName, err := cache.ParseObjectName(key); err != nil {
+				return apierrors.NewInternalError(fmt.Errorf("bad cache key: %w", err))
+			} else if objName.Namespace != c.namespace {
+				continue
+			}
+		}
+
+		if obj, exists, err := c.store.GetByKey(key); err != nil {
+			return apierrors.NewInternalError(fmt.Errorf("resource not found: %w", err))
+		} else if !exists {
+			continue
+		} else if obj, ok := obj.(*T); !ok {
 			return apierrors.NewInternalError(errors.New("resource has has wrong type"))
 		} else {
 			items[i] = *obj
diff --git a/pkg/client/interface.go b/pkg/client/interface.go
index 3247e2604..33ddce927 100644
--- a/pkg/client/interface.go
+++ b/pkg/client/interface.go
@@ -16,6 +16,7 @@ type PackageV1Alpha1Client interface {
 	PackageRepositories() PackageRepositoryInterface
 	WithStores(
 		clusterPackageStore cache.Store,
+		packageStore cache.Store,
 		packageInfoStore cache.Store,
 		packageRepositoryStore cache.Store,
 	) PackageV1Alpha1Client
diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go
index a44bc4d71..de3143b44 100644
--- a/pkg/describe/describe.go
+++ b/pkg/describe/describe.go
@@ -5,35 +5,55 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/pkg/manifest"
 )
 
-func DescribeInstalledPackage(ctx context.Context, pkgName string) (
+func DescribeInstalledClusterPackage(ctx context.Context, pkgName string) (
 	*v1alpha1.ClusterPackage, *v1alpha1.PackageManifest, error) {
-
 	pkgClient := cliutils.PackageClient(ctx)
-	repoClient := cliutils.RepositoryClientset(ctx)
 	var pkg v1alpha1.ClusterPackage
 	err := pkgClient.ClusterPackages().Get(ctx, pkgName, &pkg)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	if installedManifest, err := manifest.GetInstalledManifestForPackage(ctx, &pkg); err == nil {
-		return &pkg, installedManifest, nil
-	} else if !errors.Is(err, manifest.ErrPackageNoManifest) {
+	mf, err := GetManifestForPkg(ctx, &pkg)
+	return &pkg, mf, err
+}
+
+func DescribeInstalledPackage(ctx context.Context, namespace string, name string) (
+	*v1alpha1.Package, *v1alpha1.PackageManifest, error) {
+	pkgClient := cliutils.PackageClient(ctx)
+	var pkg v1alpha1.Package
+	err := pkgClient.Packages(namespace).Get(ctx, name, &pkg)
+	if err != nil {
 		return nil, nil, err
 	}
 
+	mf, err := GetManifestForPkg(ctx, &pkg)
+	return &pkg, mf, err
+}
+
+func GetManifestForPkg(ctx context.Context, pkg ctrlpkg.Package) (*v1alpha1.PackageManifest, error) {
+	if installedManifest, err := manifest.GetInstalledManifestForPackage(ctx, pkg); err == nil {
+		return installedManifest, nil
+	} else if !errors.Is(err, manifest.ErrPackageNoManifest) {
+		return nil, err
+	}
+
+	repoClient := cliutils.RepositoryClientset(ctx)
 	// pkg is installed, but has either no manifest or owned package info (yet): use manifest in this version from repo
 	var packageManifest v1alpha1.PackageManifest
-	err = repoClient.ForPackage(&pkg).FetchPackageManifest(pkgName, pkg.Spec.PackageInfo.Version, &packageManifest)
+	err := repoClient.ForPackage(pkg).FetchPackageManifest(
+		pkg.GetSpec().PackageInfo.Name, pkg.GetSpec().PackageInfo.Version, &packageManifest)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	} else {
-		return &pkg, &packageManifest, nil
+		return &packageManifest, nil
 	}
 }
 
diff --git a/pkg/install/install.go b/pkg/install/install.go
index fe3232c10..33bc42235 100644
--- a/pkg/install/install.go
+++ b/pkg/install/install.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 
 	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	"github.com/glasskube/glasskube/pkg/client"
 	"github.com/glasskube/glasskube/pkg/condition"
 	"github.com/glasskube/glasskube/pkg/statuswriter"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/watch"
 )
 
@@ -30,31 +30,29 @@ func (obj *installer) WithStatusWriter(sw statuswriter.StatusWriter) *installer
 
 // InstallBlocking creates a new v1alpha1.Package custom resource in the cluster and waits until
 // the package has either status Ready or Failed.
-func (obj *installer) InstallBlocking(ctx context.Context, pkg *v1alpha1.ClusterPackage,
-	opts metav1.CreateOptions) (*client.PackageStatus, error) {
+func (obj *installer) InstallBlocking(
+	ctx context.Context, pkg ctrlpkg.Package, opts metav1.CreateOptions,
+) (*client.PackageStatus, error) {
 	obj.status.Start()
 	defer obj.status.Stop()
+	pkg, err := obj.install(ctx, pkg, opts)
+	if err != nil {
+		return nil, err
+	}
 	if isDryRun(opts) {
-		_, err := obj.install(ctx, pkg, opts)
-		if err != nil {
-			return nil, err
-		}
 		return &client.PackageStatus{
 			Status:  string(condition.Ready),
 			Reason:  "DryRun",
 			Message: "Dry run - package simulated as installed and ready.",
 		}, nil
 	}
-	pkg, err := obj.install(ctx, pkg, opts)
-	if err != nil {
-		return nil, err
-	}
-	return obj.awaitInstall(ctx, pkg.GetUID())
+	return obj.awaitInstall(ctx, pkg)
 }
 
-// Install creates a new v1alpha1.Package custom resource in the cluster.
-func (obj *installer) Install(ctx context.Context, pkg *v1alpha1.ClusterPackage,
-	opts metav1.CreateOptions) error {
+// Install creates a new v1alpha1.ClusterPackage or v1alpha1.Package custom resource in the cluster.
+func (obj *installer) Install(
+	ctx context.Context, pkg ctrlpkg.Package, opts metav1.CreateOptions,
+) error {
 	obj.status.Start()
 	defer obj.status.Stop()
 	_, err := obj.install(ctx, pkg, opts)
@@ -63,27 +61,30 @@ func (obj *installer) Install(ctx context.Context, pkg *v1alpha1.ClusterPackage,
 
 func (obj *installer) install(
 	ctx context.Context,
-	pkg *v1alpha1.ClusterPackage,
+	pkg ctrlpkg.Package,
 	opts metav1.CreateOptions,
-) (*v1alpha1.ClusterPackage, error) {
-	obj.status.SetStatus(fmt.Sprintf("Installing %v...", pkg.Name))
-	err := obj.client.ClusterPackages().Create(ctx, pkg, opts)
-	if err != nil {
-		return nil, err
+) (ctrlpkg.Package, error) {
+	obj.status.SetStatus(fmt.Sprintf("Installing %v...", pkg.GetName()))
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		return pkg, obj.client.ClusterPackages().Create(ctx, pkg, opts)
+	case *v1alpha1.Package:
+		return pkg, obj.client.Packages(pkg.GetNamespace()).Create(ctx, pkg, opts)
+	default:
+		return nil, fmt.Errorf("unexpected package type: %T", pkg)
 	}
-	return pkg, nil
 }
 
-func (obj *installer) awaitInstall(ctx context.Context, pkgUID types.UID) (*client.PackageStatus, error) {
-	watcher, err := obj.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
+func (obj *installer) awaitInstall(ctx context.Context, pkg ctrlpkg.Package) (*client.PackageStatus, error) {
+	watcher, err := obj.watch(ctx, pkg)
 	if err != nil {
 		return nil, err
 	}
 	defer watcher.Stop()
 	for event := range watcher.ResultChan() {
-		if obj, ok := event.Object.(*v1alpha1.ClusterPackage); ok && obj.GetUID() == pkgUID {
+		if obj, ok := event.Object.(ctrlpkg.Package); ok && ctrlpkg.IsSameResource(obj, pkg) {
 			if event.Type == watch.Added || event.Type == watch.Modified {
-				if status := client.GetStatus(&obj.Status); status != nil {
+				if status := client.GetStatus(obj.GetStatus()); status != nil {
 					return status, nil
 				}
 			} else if event.Type == watch.Deleted {
@@ -102,3 +103,14 @@ func isDryRun(opts metav1.CreateOptions) bool {
 	}
 	return false
 }
+
+func (i *installer) watch(ctx context.Context, pkg ctrlpkg.Package) (watch.Interface, error) {
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		return i.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
+	case *v1alpha1.Package:
+		return i.client.Packages(pkg.Namespace).Watch(ctx, metav1.ListOptions{})
+	default:
+		return nil, fmt.Errorf("unexpected package type: %T", pkg)
+	}
+}
diff --git a/pkg/list/lister.go b/pkg/list/lister.go
index bcf09530c..72f8e025f 100644
--- a/pkg/list/lister.go
+++ b/pkg/list/lister.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/cliutils"
 	"github.com/glasskube/glasskube/internal/names"
@@ -17,10 +19,16 @@ import (
 type PackageWithStatus struct {
 	repotypes.MetaIndexItem
 	Status            *client.PackageStatus     `json:"status,omitempty"`
-	Package           *v1alpha1.ClusterPackage  `json:"package,omitempty"`
+	ClusterPackage    *v1alpha1.ClusterPackage  `json:"clusterpackage,omitempty"`
+	Package           *v1alpha1.Package         `json:"package,omitempty"`
 	InstalledManifest *v1alpha1.PackageManifest `json:"installedmanifest,omitempty"`
 }
 
+type PackagesWithStatus struct {
+	repotypes.MetaIndexItem
+	Packages []*PackageWithStatus
+}
+
 type ListOptions struct {
 	IncludePackageInfos bool
 	OnlyInstalled       bool
@@ -28,8 +36,10 @@ type ListOptions struct {
 }
 
 type lister struct {
-	pkgClient  client.PackageV1Alpha1Client
-	repoClient repoclient.RepoClientset
+	pkgClient   client.PackageV1Alpha1Client
+	repoClient  repoclient.RepoClientset
+	useCache    bool
+	cachedIndex *repotypes.MetaIndex
 }
 
 func NewLister(ctx context.Context) *lister {
@@ -39,55 +49,121 @@ func NewLister(ctx context.Context) *lister {
 	}
 }
 
-func (l *lister) GetPackagesWithStatus(
+// same as NewLister, but stores the meta index after the first time it has been fetched – CAUTION: this cache
+// is not concurrency-safe and therefore the listers function should only be used one at a time
+func NewListerWithRepoCache(ctx context.Context) *lister {
+	l := NewLister(ctx)
+	l.useCache = true
+	return l
+}
+
+func (l *lister) GetClusterPackagesWithStatus(
 	ctx context.Context,
 	options ListOptions,
 ) ([]*PackageWithStatus, error) {
-	index, err := l.fetchRepoAndInstalled(ctx, options)
+	index, err := l.fetchRepoAndInstalled(ctx, options, includeClusterPackages)
 	result := make([]*PackageWithStatus, 0, len(index))
 	for _, item := range index {
-		pkgWithStatus := PackageWithStatus{
-			MetaIndexItem: *item.IndexItem,
+		if itemShouldBeIncluded(&item, options) {
+			pkgWithStatus := PackageWithStatus{
+				MetaIndexItem:  *item.IndexItem,
+				ClusterPackage: item.ClusterPackage,
+				Status:         client.GetStatusOrPending(item.ClusterPackage),
+			}
+			if item.PackageInfo != nil {
+				pkgWithStatus.InstalledManifest = item.PackageInfo.Status.Manifest
+			}
+			result = append(result, &pkgWithStatus)
 		}
+	}
+	return result, err
+}
 
-		if !((options.OnlyInstalled && !item.Installed()) || (options.OnlyOutdated && !item.Outdated())) {
-			pkgWithStatus.Package = item.Package
-			pkgWithStatus.Status = client.GetStatusOrPending(item.Package)
-
+func (l *lister) GetPackagesWithStatus(
+	ctx context.Context,
+	options ListOptions,
+) ([]*PackagesWithStatus, error) {
+	index, err := l.fetchRepoAndInstalled(ctx, options, includePackages)
+	result := make([]*PackagesWithStatus, 0, len(index))
+	for _, item := range index {
+		// TODO itemShouldBeIncluded is wrong here – need to check outdated in the inner loop
+		// if itemShouldBeIncluded(&item, options) {
+		ls := make([]*PackageWithStatus, 0, len(item.Packages))
+		for _, pkg := range item.Packages {
+			pkgWithStatus := PackageWithStatus{
+				MetaIndexItem: *item.IndexItem,
+				Package:       pkg,
+				Status:        client.GetStatusOrPending(pkg),
+			}
 			if item.PackageInfo != nil {
 				pkgWithStatus.InstalledManifest = item.PackageInfo.Status.Manifest
 			}
-
-			result = append(result, &pkgWithStatus)
+			ls = append(ls, &pkgWithStatus)
 		}
+		result = append(result, &PackagesWithStatus{
+			MetaIndexItem: *item.IndexItem,
+			Packages:      ls,
+		})
+		// }
 	}
 	return result, err
 }
 
-func (l *lister) fetchRepoAndInstalled(ctx context.Context, options ListOptions) (
+func itemShouldBeIncluded(item *result, options ListOptions) bool {
+	return !((options.OnlyInstalled && !item.Installed()) || (options.OnlyOutdated && !item.Outdated()))
+}
+
+type typeOptions int
+
+const (
+	includeClusterPackages typeOptions = 1 << iota
+	includePackages
+	includeAll = includePackages | includeClusterPackages
+)
+
+func (l *lister) fetchRepoAndInstalled(ctx context.Context, options ListOptions, typeOpts typeOptions) (
 	[]result,
 	error,
 ) {
 	var index repotypes.MetaIndex
-	var packages v1alpha1.ClusterPackageList
+	var clusterPackages v1alpha1.ClusterPackageList
+	var packages v1alpha1.PackageList
 	var packageInfos v1alpha1.PackageInfoList
-	var repoErr, pkgErr, pkgInfoErr error
+	var repoErr, clPkgErr, pkgErr, pkgInfoErr error
 	wg := new(sync.WaitGroup)
-	wg.Add(2)
 
-	go func() {
-		defer wg.Done()
-		if err := l.repoClient.Meta().FetchMetaIndex(&index); err != nil {
-			repoErr = fmt.Errorf("could not fetch package repository index: %w", err)
-		}
-	}()
+	if !l.useCache || l.cachedIndex == nil {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := l.repoClient.Meta().FetchMetaIndex(&index); err != nil {
+				repoErr = fmt.Errorf("could not fetch package repository index: %w", err)
+			}
+			l.cachedIndex = &index
+		}()
+	} else {
+		index = *l.cachedIndex
+	}
 
-	go func() {
-		defer wg.Done()
-		if err := l.pkgClient.ClusterPackages().GetAll(ctx, &packages); err != nil {
-			pkgErr = fmt.Errorf("could not fetch installed packages: %w", err)
-		}
-	}()
+	if typeOpts&includeClusterPackages != 0 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := l.pkgClient.ClusterPackages().GetAll(ctx, &clusterPackages); err != nil {
+				clPkgErr = fmt.Errorf("could not fetch installed clusterpackages: %w", err)
+			}
+		}()
+	}
+
+	if typeOpts&includePackages != 0 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := l.pkgClient.Packages("").GetAll(ctx, &packages); err != nil {
+				pkgErr = fmt.Errorf("could not fetch installed packages: %w", err)
+			}
+		}()
+	}
 
 	if options.IncludePackageInfos {
 		wg.Add(1)
@@ -101,27 +177,48 @@ func (l *lister) fetchRepoAndInstalled(ctx context.Context, options ListOptions)
 
 	wg.Wait()
 
-	compositeErr := multierr.Combine(repoErr, pkgErr, pkgInfoErr)
-	if pkgErr != nil || pkgInfoErr != nil {
+	compositeErr := multierr.Combine(repoErr, clPkgErr, pkgErr, pkgInfoErr)
+	if clPkgErr != nil || pkgErr != nil || pkgInfoErr != nil {
+		// repoErr is ignored here, because that way we can still return a partial list, if one of the repos is not available
 		return nil, compositeErr
 	}
 
-	result := make([]result, len(index.Packages))
+	// TODO what if a package is namespaced in one repository, and with the same name cluster scoped in another??
+
+	resultLs := make([]result, 0)
 	for i, indexPackage := range index.Packages {
-		result[i].IndexItem = &index.Packages[i]
-		for j, pkg := range packages.Items {
-			if indexPackage.Name == pkg.Name {
-				result[i].Package = &packages.Items[j]
-				packageInfoName := names.PackageInfoName(&pkg)
-				for k, packageInfo := range packageInfos.Items {
-					if packageInfo.Name == packageInfoName {
-						result[i].PackageInfo = &packageInfos.Items[k]
-						break
-					}
+		res := result{
+			IndexItem: &index.Packages[i],
+		}
+		if indexPackage.Scope.IsCluster() && typeOpts&includeClusterPackages != 0 {
+			for j, pkg := range clusterPackages.Items {
+				if indexPackage.Name == pkg.Name {
+					res.ClusterPackage = &clusterPackages.Items[j]
+					setPackageInfo(packageInfos, &res, &pkg)
+					break
 				}
-				break
 			}
+			resultLs = append(resultLs, res)
+		} else if indexPackage.Scope.IsNamespaced() && typeOpts&includePackages != 0 {
+			for j, pkg := range packages.Items {
+				if indexPackage.Name == pkg.Spec.PackageInfo.Name {
+					res.Packages = append(res.Packages, &packages.Items[j])
+					setPackageInfo(packageInfos, &res, &pkg)
+				}
+			}
+			resultLs = append(resultLs, res)
+		}
+	}
+
+	return resultLs, compositeErr
+}
+
+func setPackageInfo(packageInfos v1alpha1.PackageInfoList, res *result, pkg ctrlpkg.Package) {
+	packageInfoName := names.PackageInfoName(pkg)
+	for k, packageInfo := range packageInfos.Items {
+		if packageInfo.Name == packageInfoName {
+			res.PackageInfo = &packageInfos.Items[k]
+			break
 		}
 	}
-	return result, compositeErr
 }
diff --git a/pkg/list/result.go b/pkg/list/result.go
index 28cebcb9f..c31265fa5 100644
--- a/pkg/list/result.go
+++ b/pkg/list/result.go
@@ -6,17 +6,19 @@ import (
 )
 
 type result struct {
-	IndexItem    *types.MetaIndexItem
-	Package      *v1alpha1.ClusterPackage
-	PackageInfo  *v1alpha1.PackageInfo
-	Repositories []*v1alpha1.PackageRepository
+	IndexItem      *types.MetaIndexItem
+	ClusterPackage *v1alpha1.ClusterPackage
+	Packages       []*v1alpha1.Package
+	PackageInfo    *v1alpha1.PackageInfo
+	Repositories   []*v1alpha1.PackageRepository
 }
 
 func (item result) Installed() bool {
-	return item.Package != nil
+	return item.ClusterPackage != nil
 }
 
 func (item result) Outdated() bool {
-	return item.Package != nil && item.IndexItem != nil &&
-		item.Package.Spec.PackageInfo.Version != item.IndexItem.LatestVersion
+	// TODO check again whether this works correctly in relation with multiple repos?
+	return item.ClusterPackage != nil && item.IndexItem != nil &&
+		item.ClusterPackage.Spec.PackageInfo.Version != item.IndexItem.LatestVersion
 }
diff --git a/pkg/open/open.go b/pkg/open/open.go
index cf090afb8..a7038f264 100644
--- a/pkg/open/open.go
+++ b/pkg/open/open.go
@@ -204,8 +204,8 @@ func (o *opener) service(
 
 	if manifest.Helm != nil {
 		svcNameCandidates = append(svcNameCandidates,
-			strings.Join([]string{pkg.GetName(), entrypoint.Name}, "-"),
-			strings.Join([]string{names.HelmResourceName(pkg, manifest), entrypoint.Name}, "-"),
+			strings.Join([]string{pkg.GetName(), entrypoint.ServiceName}, "-"),
+			strings.Join([]string{names.HelmResourceName(pkg, manifest), entrypoint.ServiceName}, "-"),
 			names.HelmResourceName(pkg, manifest),
 		)
 	}
diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go
index c718250e2..ecf6f31a0 100644
--- a/pkg/uninstall/uninstall.go
+++ b/pkg/uninstall/uninstall.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 
 	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+	"github.com/glasskube/glasskube/internal/util"
 	"github.com/glasskube/glasskube/pkg/client"
 	"github.com/glasskube/glasskube/pkg/statuswriter"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,8 +19,6 @@ type uninstaller struct {
 	status statuswriter.StatusWriter
 }
 
-var deletePropagationForeground = metav1.DeletePropagationForeground
-
 func NewUninstaller(pkgClient client.PackageV1Alpha1Client) *uninstaller {
 	return &uninstaller{client: pkgClient, status: statuswriter.Noop()}
 }
@@ -30,37 +30,48 @@ func (obj *uninstaller) WithStatusWriter(sw statuswriter.StatusWriter) *uninstal
 
 // UninstallBlocking deletes the v1alpha1.Package custom resource from the
 // cluster and waits until the package is fully deleted.
-func (obj *uninstaller) UninstallBlocking(ctx context.Context, pkg *v1alpha1.ClusterPackage) error {
+func (obj *uninstaller) UninstallBlocking(ctx context.Context, pkg ctrlpkg.Package) error {
 	obj.status.Start()
 	defer obj.status.Stop()
 	err := obj.delete(ctx, pkg)
 	if err != nil {
 		return err
 	}
-	return obj.awaitDeletion(ctx, pkg.Name)
+	return obj.awaitDeletion(ctx, pkg)
 }
 
 // Uninstall deletes the v1alpha1.Package custom resource from the cluster.
-func (obj *uninstaller) Uninstall(ctx context.Context, pkg *v1alpha1.ClusterPackage) error {
+func (obj *uninstaller) Uninstall(ctx context.Context, pkg ctrlpkg.Package) error {
 	obj.status.Start()
 	defer obj.status.Stop()
 	return obj.delete(ctx, pkg)
 }
 
-func (obj *uninstaller) delete(ctx context.Context, pkg *v1alpha1.ClusterPackage) error {
-	obj.status.SetStatus(fmt.Sprintf("Uninstalling %v...", pkg.Name))
-	return obj.client.ClusterPackages().
-		Delete(ctx, pkg, metav1.DeleteOptions{PropagationPolicy: &deletePropagationForeground})
+func (uninstaller *uninstaller) delete(ctx context.Context, pkg ctrlpkg.Package) error {
+	deleteOptions := metav1.DeleteOptions{
+		PropagationPolicy: util.Pointer(metav1.DeletePropagationForeground),
+	}
+
+	uninstaller.status.SetStatus(fmt.Sprintf("Uninstalling %v...", pkg.GetName()))
+
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		return uninstaller.client.ClusterPackages().Delete(ctx, pkg, deleteOptions)
+	case *v1alpha1.Package:
+		return uninstaller.client.Packages(pkg.Namespace).Delete(ctx, pkg, deleteOptions)
+	default:
+		return fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind)
+	}
 }
 
-func (obj *uninstaller) awaitDeletion(ctx context.Context, name string) error {
-	watcher, err := obj.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
+func (obj *uninstaller) awaitDeletion(ctx context.Context, pkg ctrlpkg.Package) error {
+	watcher, err := obj.createWatcher(ctx, pkg)
 	if err != nil {
 		return err
 	}
 	defer watcher.Stop()
 	for event := range watcher.ResultChan() {
-		if pkg, ok := event.Object.(*v1alpha1.ClusterPackage); ok && pkg.Name == name {
+		if eventPkg, ok := event.Object.(ctrlpkg.Package); ok && ctrlpkg.IsSameResource(eventPkg, pkg) {
 			if event.Type == watch.Deleted {
 				return nil // Package deletion confirmed
 			}
@@ -68,3 +79,14 @@ func (obj *uninstaller) awaitDeletion(ctx context.Context, name string) error {
 	}
 	return errors.New("failed to confirm package deletion")
 }
+
+func (obj *uninstaller) createWatcher(ctx context.Context, pkg ctrlpkg.Package) (watch.Interface, error) {
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		return obj.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
+	case *v1alpha1.Package:
+		return obj.client.Packages(pkg.Namespace).Watch(ctx, metav1.ListOptions{})
+	default:
+		return nil, fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind)
+	}
+}
diff --git a/pkg/update/getter.go b/pkg/update/getter.go
new file mode 100644
index 000000000..0c40937fe
--- /dev/null
+++ b/pkg/update/getter.go
@@ -0,0 +1,151 @@
+package update
+
+import (
+	"context"
+
+	"github.com/glasskube/glasskube/api/v1alpha1"
+	"github.com/glasskube/glasskube/internal/clicontext"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
+	apitypes "k8s.io/apimachinery/pkg/types"
+)
+
+type PackagesGetter interface {
+	Get(ctx context.Context) ([]ctrlpkg.Package, error)
+	Explicit() bool
+}
+
+type exactPackagesGetter struct {
+	pkgs []ctrlpkg.Package
+}
+
+// Explicit implements PackagesGetter.
+func (s *exactPackagesGetter) Explicit() bool {
+	return true
+}
+
+// Get implements PackagesGetter.
+func (s *exactPackagesGetter) Get(ctx context.Context) ([]ctrlpkg.Package, error) {
+	return s.pkgs, nil
+}
+
+func GetExact(pkgs []ctrlpkg.Package) PackagesGetter {
+	return &exactPackagesGetter{pkgs: pkgs}
+}
+
+type clusterPackagesGetter struct{}
+
+// Explicit implements PackagesGetter.
+func (c *clusterPackagesGetter) Explicit() bool {
+	return false
+}
+
+// Get implements PackagesGetter.
+func (*clusterPackagesGetter) Get(ctx context.Context) ([]ctrlpkg.Package, error) {
+	client := clicontext.PackageClientFromContext(ctx)
+	var list v1alpha1.ClusterPackageList
+	if err := client.ClusterPackages().GetAll(ctx, &list); err != nil {
+		return nil, err
+	} else {
+		r := make([]ctrlpkg.Package, len(list.Items))
+		for i := range list.Items {
+			r[i] = &list.Items[i]
+		}
+		return r, err
+	}
+}
+
+func GetAllClusterPackages() PackagesGetter {
+	return &clusterPackagesGetter{}
+}
+
+type packagesGetter struct{ ns string }
+
+// Explicit implements PackagesGetter.
+func (p *packagesGetter) Explicit() bool {
+	return false
+}
+
+// Get implements PackagesGetter.
+func (p *packagesGetter) Get(ctx context.Context) ([]ctrlpkg.Package, error) {
+	client := clicontext.PackageClientFromContext(ctx)
+	var list v1alpha1.PackageList
+	if err := client.Packages(p.ns).GetAll(ctx, &list); err != nil {
+		return nil, err
+	} else {
+		r := make([]ctrlpkg.Package, len(list.Items))
+		for i := range list.Items {
+			r[i] = &list.Items[i]
+		}
+		return r, err
+	}
+}
+
+func GetAllPackages(ns string) PackagesGetter {
+	return &packagesGetter{ns: ns}
+}
+
+type clusterPackagesWithNameGetter struct {
+	names []string
+}
+
+// Explicit implements PackagesGetter.
+func (c *clusterPackagesWithNameGetter) Explicit() bool {
+	return true
+}
+
+// Get implements PackagesGetter.
+func (c *clusterPackagesWithNameGetter) Get(ctx context.Context) ([]ctrlpkg.Package, error) {
+	client := clicontext.PackageClientFromContext(ctx)
+	pkgs := make([]ctrlpkg.Package, len(c.names))
+	for i, name := range c.names {
+		var pkg v1alpha1.ClusterPackage
+		if err := client.ClusterPackages().Get(ctx, name, &pkg); err != nil {
+			return nil, err
+		}
+		pkgs[i] = &pkg
+	}
+	return pkgs, nil
+}
+
+func GetClusterPackagesWithNames(names []string) PackagesGetter {
+	return &clusterPackagesWithNameGetter{names: names}
+}
+
+func GetClusterPackageWithName(name string) PackagesGetter {
+	return &clusterPackagesWithNameGetter{names: []string{name}}
+}
+
+type packagesWithNameGetter struct {
+	namespacedNames []apitypes.NamespacedName
+}
+
+// Explicit implements PackagesGetter.
+func (p *packagesWithNameGetter) Explicit() bool {
+	return true
+}
+
+// Get implements PackagesGetter.
+func (p *packagesWithNameGetter) Get(ctx context.Context) ([]ctrlpkg.Package, error) {
+	client := clicontext.PackageClientFromContext(ctx)
+	pkgs := make([]ctrlpkg.Package, len(p.namespacedNames))
+	for i, name := range p.namespacedNames {
+		var pkg v1alpha1.Package
+		if err := client.Packages(name.Namespace).Get(ctx, name.Name, &pkg); err != nil {
+			return nil, err
+		}
+		pkgs[i] = &pkg
+	}
+	return pkgs, nil
+}
+
+func GetPackagesWithNames(namespacedNames []apitypes.NamespacedName) PackagesGetter {
+	return &packagesWithNameGetter{}
+}
+
+func GetPackageWithName(namespace, name string) PackagesGetter {
+	return &packagesWithNameGetter{
+		namespacedNames: []apitypes.NamespacedName{
+			{Namespace: namespace, Name: name},
+		},
+	}
+}
diff --git a/pkg/update/update.go b/pkg/update/update.go
index f2908ed20..b3a1ee87a 100644
--- a/pkg/update/update.go
+++ b/pkg/update/update.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/glasskube/glasskube/api/v1alpha1"
 	"github.com/glasskube/glasskube/internal/cliutils"
+	"github.com/glasskube/glasskube/internal/controller/ctrlpkg"
 	"github.com/glasskube/glasskube/internal/dependency"
 	"github.com/glasskube/glasskube/internal/repo"
 	repoclient "github.com/glasskube/glasskube/internal/repo/client"
@@ -14,8 +15,11 @@ import (
 	"github.com/glasskube/glasskube/pkg/client"
 	"github.com/glasskube/glasskube/pkg/condition"
 	"github.com/glasskube/glasskube/pkg/statuswriter"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/util/retry"
 )
 
 type UpdateTransaction struct {
@@ -34,7 +38,7 @@ func (tx UpdateTransaction) IsEmpty() bool {
 }
 
 type updateTransactionItem struct {
-	Package v1alpha1.ClusterPackage
+	Package ctrlpkg.Package
 	Version string
 }
 
@@ -69,19 +73,13 @@ func (c *updater) WithStatusWriter(writer statuswriter.StatusWriter) *updater {
 }
 
 func (c *updater) PrepareForVersion(
-	ctx context.Context,
-	pkgName string,
-	pkgVersion string) (*UpdateTransaction, error) {
+	ctx context.Context, pkg ctrlpkg.Package, pkgVersion string,
+) (*UpdateTransaction, error) {
 	c.status.Start()
 	defer c.status.Stop()
 	c.status.SetStatus("Collecting installed package")
 
-	var pkg v1alpha1.ClusterPackage
-	if err := c.client.ClusterPackages().Get(ctx, pkgName, &pkg); err != nil {
-		return nil, fmt.Errorf("failed to get package %v: %v", pkgName, err)
-	}
-
-	if !semver.IsUpgradable(pkg.Spec.PackageInfo.Version, pkgVersion) {
+	if !semver.IsUpgradable(pkg.GetSpec().PackageInfo.Version, pkgVersion) {
 		return nil, fmt.Errorf("can't update to downgraded version or equal version")
 	}
 
@@ -90,7 +88,8 @@ func (c *updater) PrepareForVersion(
 	var tx UpdateTransaction
 	item := updateTransactionItem{Package: pkg, Version: pkgVersion}
 	var manifest v1alpha1.PackageManifest
-	if err := c.repoClient.ForPackage(&pkg).FetchPackageManifest(pkg.Name, pkgVersion, &manifest); err != nil {
+	if err := c.repoClient.ForPackage(pkg).
+		FetchPackageManifest(pkg.GetSpec().PackageInfo.Name, pkgVersion, &manifest); err != nil {
 		return nil, err
 	} else if result, err := c.dm.Validate(ctx, &manifest, pkgVersion); err != nil {
 		return nil, err
@@ -103,54 +102,55 @@ func (c *updater) PrepareForVersion(
 	return &tx, nil
 }
 
-func (c *updater) Prepare(ctx context.Context, packageNames []string) (*UpdateTransaction, error) {
+func (c *updater) Prepare(ctx context.Context, getters ...PackagesGetter) (*UpdateTransaction, error) {
 	c.status.Start()
 	defer c.status.Stop()
 	c.status.SetStatus("Collecting installed packages")
-	var packagesToUpdate []v1alpha1.ClusterPackage
-	if len(packageNames) > 0 {
-		// Fetch all requested packages individually.
-		// This way, we can fail early if a requested package is not installed.
-		for _, name := range packageNames {
-			var pkg v1alpha1.ClusterPackage
-			if err := c.client.ClusterPackages().Get(ctx, name, &pkg); err != nil {
-				return nil, fmt.Errorf("failed to get package %v: %v", name, err)
-			}
-			packagesToUpdate = append(packagesToUpdate, pkg)
-		}
-	} else {
-		var packageList v1alpha1.ClusterPackageList
-		if err := c.client.ClusterPackages().GetAll(ctx, &packageList); err != nil {
-			return nil, fmt.Errorf("failed to get list of installed packages: %v", err)
+	var pkgs []ctrlpkg.Package
+	var explicit bool
+	for _, getter := range getters {
+		explicit = explicit || getter.Explicit()
+		if p, err := getter.Get(ctx); err != nil {
+			return nil, err
+		} else {
+			pkgs = append(pkgs, p...)
 		}
-		packagesToUpdate = packageList.Items
 	}
+	return c.prepare(ctx, pkgs, explicit)
+}
 
+func (c *updater) prepare(
+	ctx context.Context, packagesToUpdate []ctrlpkg.Package, explicitRequest bool,
+) (*UpdateTransaction, error) {
 	c.status.SetStatus("Updating package index")
 
 	requirementsSet := make(map[dependency.Requirement]struct{})
 	var tx UpdateTransaction
+
 outer:
 	for _, pkg := range packagesToUpdate {
-		repoClient := c.repoClient.ForPackage(&pkg)
+		repoClient := c.repoClient.ForPackage(pkg)
 		var index repo.PackageRepoIndex
 		if err := repoClient.FetchPackageRepoIndex(&index); err != nil {
 			return nil, fmt.Errorf("failed to fetch index: %v", err)
 		}
 
 		for _, indexItem := range index.Packages {
-			if indexItem.Name == pkg.Name {
-				if semver.IsUpgradable(pkg.Spec.PackageInfo.Version, indexItem.LatestVersion) {
+			if indexItem.Name == pkg.GetSpec().PackageInfo.Name {
+				if semver.IsUpgradable(pkg.GetSpec().PackageInfo.Version, indexItem.LatestVersion) {
 					item := updateTransactionItem{Package: pkg, Version: indexItem.LatestVersion}
 					var manifest v1alpha1.PackageManifest
-					if err := repoClient.FetchPackageManifest(pkg.Name, indexItem.LatestVersion, &manifest); err != nil {
+					if err := repoClient.FetchPackageManifest(
+						pkg.GetSpec().PackageInfo.Name, indexItem.LatestVersion, &manifest); err != nil {
 						return nil, err
 					}
 					if result, err := c.dm.Validate(ctx, &manifest, indexItem.LatestVersion); err != nil {
 						return nil, err
 					} else if len(result.Conflicts) > 0 {
 						// This package can't be updated due to conflicts
-						tx.ConflictItems = append(tx.ConflictItems, updateTransactionItemConflict{item, result.Conflicts})
+						tx.ConflictItems = append(tx.ConflictItems,
+							updateTransactionItemConflict{item, result.Conflicts},
+						)
 					} else {
 						for _, req := range result.Requirements {
 							requirementsSet[req] = struct{}{}
@@ -158,7 +158,7 @@ outer:
 						// this package should be updated
 						tx.Items = append(tx.Items, item)
 					}
-				} else if len(packageNames) > 0 {
+				} else if explicitRequest {
 					// this package is already up-to-date but an update was requested via argument
 					tx.Items = append(tx.Items, updateTransactionItem{Package: pkg})
 				}
@@ -166,7 +166,7 @@ outer:
 			}
 		}
 		// This can happen if a package was removed from the index for some reason.
-		return nil, fmt.Errorf("package %v not found in index", pkg.Name)
+		return nil, fmt.Errorf("package %v not found in index", pkg.GetSpec().PackageInfo.Name)
 	}
 
 	for req := range requirementsSet {
@@ -176,19 +176,33 @@ outer:
 	return &tx, nil
 }
 
-func (c *updater) Apply(ctx context.Context, tx *UpdateTransaction) ([]v1alpha1.ClusterPackage, error) {
+func (c *updater) Apply(ctx context.Context, tx *UpdateTransaction) ([]ctrlpkg.Package, error) {
+	return c.apply(ctx, tx, false)
+}
+
+func (c *updater) ApplyBlocking(ctx context.Context, tx *UpdateTransaction) ([]ctrlpkg.Package, error) {
+	return c.apply(ctx, tx, true)
+}
+
+func (c *updater) apply(ctx context.Context, tx *UpdateTransaction, blocking bool) ([]ctrlpkg.Package, error) {
 	c.status.Start()
 	defer c.status.Stop()
-	var updatedPackages []v1alpha1.ClusterPackage
+	var updatedPackages []ctrlpkg.Package
 	for _, item := range tx.Items {
 		if item.UpdateRequired() {
-			c.status.SetStatus(fmt.Sprintf("Updating %v", item.Package.Name))
-			if err := c.UpdatePackage(ctx, &item.Package, item.Version); err != nil {
-				return nil, fmt.Errorf("could not update package %v: %w", item.Package.Name, err)
+			c.status.SetStatus(fmt.Sprintf("Updating %v", item.Package.GetName()))
+			err := retry.OnError(retry.DefaultRetry,
+				apierrors.IsNotFound,
+				func() error { return c.UpdatePackage(ctx, item.Package, item.Version) },
+			)
+			if err != nil {
+				return nil, fmt.Errorf("could not update package %v: %w", item.Package.GetName(), err)
 			}
-			c.status.SetStatus(fmt.Sprintf("Checking %v", item.Package.Name))
-			if err := c.awaitUpdate(ctx, &item.Package); err != nil {
-				return nil, fmt.Errorf("package update for %v failed: %w", item.Package.Name, err)
+			if blocking {
+				c.status.SetStatus(fmt.Sprintf("Checking %v", item.Package.GetName()))
+				if err := c.awaitUpdate(ctx, item.Package); err != nil {
+					return nil, fmt.Errorf("package update for %v failed: %w", item.Package.GetName(), err)
+				}
 			}
 			updatedPackages = append(updatedPackages, item.Package)
 		}
@@ -196,23 +210,46 @@ func (c *updater) Apply(ctx context.Context, tx *UpdateTransaction) ([]v1alpha1.
 	return updatedPackages, nil
 }
 
-func (c *updater) UpdatePackage(ctx context.Context, pkg *v1alpha1.ClusterPackage, version string) error {
-	pkg.Spec.PackageInfo.Version = version
-	return c.client.ClusterPackages().Update(ctx, pkg)
+func (c *updater) UpdatePackage(ctx context.Context, pkg ctrlpkg.Package, version string) error {
+	pkg.GetSpec().PackageInfo.Version = version
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		return c.client.ClusterPackages().Update(ctx, pkg)
+	case *v1alpha1.Package:
+		return c.client.Packages(pkg.GetNamespace()).Update(ctx, pkg)
+	default:
+		return fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind)
+	}
 }
 
-func (c *updater) awaitUpdate(ctx context.Context, pkg *v1alpha1.ClusterPackage) error {
-	watcher, err := c.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
-	if err != nil {
-		return err
+func (c *updater) awaitUpdate(ctx context.Context, pkg ctrlpkg.Package) error {
+	switch pkg := pkg.(type) {
+	case *v1alpha1.ClusterPackage:
+		watcher, err := c.client.ClusterPackages().Watch(ctx, metav1.ListOptions{})
+		if err != nil {
+			return err
+		}
+		return c.await(watcher, pkg)
+	case *v1alpha1.Package:
+		watcher, err := c.client.Packages(pkg.Namespace).Watch(ctx, metav1.ListOptions{})
+		if err != nil {
+			return err
+		}
+		return c.await(watcher, pkg)
+	default:
+		return fmt.Errorf("unexpected object kind: %v", pkg.GroupVersionKind().Kind)
 	}
+}
+
+func (c *updater) await(watcher watch.Interface, pkg ctrlpkg.Package) error {
 	defer watcher.Stop()
 	for event := range watcher.ResultChan() {
-		if eventPkg, ok := event.Object.(*v1alpha1.ClusterPackage); ok && eventPkg.GetUID() == pkg.GetUID() {
-			if eventPkg.Status.Version == eventPkg.Spec.PackageInfo.Version {
+		if eventPkg, ok := event.Object.(ctrlpkg.Package); ok && eventPkg.GetUID() == pkg.GetUID() {
+			if eventPkg.GetStatus().Version == eventPkg.GetSpec().PackageInfo.Version {
 				return nil
 			}
-			if condition := meta.FindStatusCondition(eventPkg.Status.Conditions, string(condition.Ready)); condition != nil {
+			if condition := meta.FindStatusCondition(
+				eventPkg.GetStatus().Conditions, string(condition.Ready)); condition != nil {
 				if condition.Status == metav1.ConditionFalse {
 					return fmt.Errorf("Package is not ready (reason %v): %v", condition.Reason, condition.Message)
 				}
diff --git a/website/.prettierignore b/website/.prettierignore
new file mode 100644
index 000000000..77c3fa4d8
--- /dev/null
+++ b/website/.prettierignore
@@ -0,0 +1,9 @@
+node_modules
+/build
+.docusaurus
+.cache-loader
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
diff --git a/website/.prettierrc.mjs b/website/.prettierrc.mjs
new file mode 100644
index 000000000..aaab946a0
--- /dev/null
+++ b/website/.prettierrc.mjs
@@ -0,0 +1,11 @@
+export default {
+  arrowParens: "avoid",
+  bracketSameLine: true,
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: "all",
+  tabWidth: 2,
+  useTabs: false,
+  semi: true,
+  printWidth: 80,
+};
diff --git a/website/blog/2024-03-22-release-0.1.0/index.mdx b/website/blog/2024-03-22-release-0.1.0/index.mdx
index 1ee663b6c..7bbbe8f25 100644
--- a/website/blog/2024-03-22-release-0.1.0/index.mdx
+++ b/website/blog/2024-03-22-release-0.1.0/index.mdx
@@ -26,7 +26,7 @@ We are happy you choose to be part of our journey in making Kubernetes package m
 
 Watch our release video to get an overview of what has changed:
 
-<iframe width="100%" height="460" src="https://www.youtube.com/embed/Ea7-LfzRr8E?si=HOci6IDl1R2Tj8kF"
+<iframe width="100%" height="460" src="https://www.youtube-nocookie.com/embed/Ea7-LfzRr8E?si=umTT-bbMuuYwM7lm"
         title="YouTube video player" frameborder="0"
         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 
diff --git a/website/blog/2024-04-26-beta-launch-blog/index.mdx b/website/blog/2024-04-26-beta-launch-blog/index.mdx
index 546a80158..81c7751fa 100644
--- a/website/blog/2024-04-26-beta-launch-blog/index.mdx
+++ b/website/blog/2024-04-26-beta-launch-blog/index.mdx
@@ -18,7 +18,7 @@ The Glasskube team as well as the growing community of Glasskube open source con
 
 As we [release Glasskube Beta](https://github.com/glasskube/glasskube/releases) we aim to bring to Kubernetes engineers tasked with maintaining the lifecycle of the packages that make up their clusters with an expanded and more mature version of Glasskube that delivers on the early promises of on app package configuration, automated updates and an ever growing package catalogue. The Beta release is still not intended to be run in production environments, in order to become production ready in the upcoming releases we hope to get valuable feedback from the Glasskube community. 
 
-<iframe width="560" height="315" src="https://www.youtube.com/embed/ONNUP7l7WJM?si=zx01laPT6yXu48sI" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/ONNUP7l7WJM?si=y3tJVPcbyn6O7epl" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
 
 We are so excited to get this release in the hands of all of you and see what you think. Here as some of the features and updated shipped: 
 
@@ -72,7 +72,7 @@ The [Kubeflow](https://www.kubeflow.org/) project is dedicated to making deploym
 
 Here Glasskube co-founder [Philip Miglinci](https://www.linkedin.com/in/pmigat/) walked us through the new Glasskube features, improvements and gave a greate demo that included how to install and manage kubernetes packages using a GitOps framework by leveraging ArgoCD and a super simple process to seemlessly manage your cluster package stack. Really cool talk!
 
-<iframe width="560" height="315" src="https://www.youtube.com/embed/cphFMYivSyU?si=hMfEJWIE0aZNLbzV" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/cphFMYivSyU?si=ZUK4H-zbiCq_um39" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
 
 ## We launched on Product Hunt 😼
 
diff --git a/website/docs/03_components/02_package-operator.md b/website/docs/03_components/02_package-operator.md
index 2a7f1e543..55709b8ca 100644
--- a/website/docs/03_components/02_package-operator.md
+++ b/website/docs/03_components/02_package-operator.md
@@ -7,7 +7,7 @@ The package operator follows the [Kubernetes Operator Pattern](https://kubernete
 The Package controller manages the `Package` resources of the cluster. 
 
 Whenever a `Package` has been created, changed or deleted these changes will be picked up and applied by the Package controller.
-The Package controller also makes sure that dependencies of a `Package` are met without conflicting installations, by applying the logic described [here](#dependency-management).
+The Package controller also makes sure that dependencies of a `Package` are met without conflicting installations, by applying the logic described [here](../04_design/dependency-management.md).
 
 ## PackageInfo Controller
 
@@ -69,4 +69,4 @@ while there might already be a prerelease of a new major version like `v2.0.0-al
 
 Instead of fetching `repository.xyz/package-name/package.yaml`, the operator fetches `repository.xyz/package-name/version/package.yaml`
 
-Check the [package repository docs](../package-repository#structure) and [dependency management docs](../04_design/dependency-management.md) for more information.
+Check the [package repository docs](./03_package-repository.md#structure) and [dependency management docs](../04_design/dependency-management.md) for more information.
diff --git a/website/docs/05_comparisons/02_timoni.md b/website/docs/05_comparisons/02_timoni.md
index e52e44ce7..4c75cb59a 100644
--- a/website/docs/05_comparisons/02_timoni.md
+++ b/website/docs/05_comparisons/02_timoni.md
@@ -11,7 +11,7 @@ description: Timoni installs and updates cloud-native applications as bundles (O
 
 Timoni is closer related to Helm than Glasskube, but brings some features and new approaches to the table Helm doesn't offer.
 Its bundles are OCI images, so the only way to install these bundles is to publish them first to an OCI registry,
-which makes additional security features like image (co-)singing possible.
+which makes additional security features like image (co-)signing possible.
 Similar to Glasskube it performs garbage collection of orphan resources after an uninstallation operation.
 
 Timoni is generally more mature than Glasskube. However, it doesn't prioritize making standard package installation and upgrades easy.
diff --git a/website/docs/index.md b/website/docs/index.md
index 8b5625c65..d1a3b2d5a 100644
--- a/website/docs/index.md
+++ b/website/docs/index.md
@@ -90,8 +90,8 @@ The package operator has two controllers:
 #### Package Repository
 
 A place where `PackageManifest`s are stored, searched and maintained.
-There is a central package repository managed by Glasskube: [`glasskube/packages`](https://github.com/glasskube/packages), 
-however using custom package repositories is supported too, see [Glasskube Repositories](design/repositories).  
+There is a central package repository managed by Glasskube: [`glasskube/packages`](https://github.com/glasskube/packages),
+however using custom package repositories is supported too, see [Glasskube Repositories](design/repositories).
 
 ## Commands
 
@@ -153,9 +153,16 @@ Use `glasskube open <package> <entrypoint>` to open a specific entrypoint.
 
 ### `glasskube repo`
 
-Manages the package repositories of the cluster. `glasskube repo list` lists the currently configured repositories, 
+Manages the package repositories of the cluster. `glasskube repo list` lists the currently configured repositories,
 while `glasskube repo add` allows you to add new repositories to your cluster.
 
+### `glasskube purge`
+
+Uninstalls the Glassube package-operator from the current cluster and deletes all Glasskube Custom Resource Definitions.
+**Warning:** This will delete all installed packages.
+
+If you are unhappy with Glasskube we would love to hear your feedback, so please get in touch!
+
 ### `glasskube version`
 
 Prints the version of the local Glasskube installation, as well as the installed cluster components.
diff --git a/website/eslint.config.mjs b/website/eslint.config.mjs
new file mode 100644
index 000000000..a998af6e8
--- /dev/null
+++ b/website/eslint.config.mjs
@@ -0,0 +1,52 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import * as tseslint from "typescript-eslint";
+import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
+import prettierEslintPlugin from "eslint-plugin-prettier";
+import docusaurusEslintPlugin from "@docusaurus/eslint-plugin";
+import pluginPrettierConfig from "eslint-config-prettier";
+
+/** @type {import('eslint').Linter.FlatConfig[]} */
+export default [
+  {ignores: [".docusaurus/*", "build/*"]},
+  {
+    plugins: {
+      prettier: prettierEslintPlugin,
+      "@docusaurus": docusaurusEslintPlugin,
+    },
+  },
+  {
+    languageOptions: {
+      parser: tseslint.parser, 
+      parserOptions: {
+        ecmaFeatures: {jsx: true},
+        sourceType: "module"
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.es2021,
+        ...globals.node 
+      },
+    },
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  pluginPrettierConfig,
+  pluginReactConfig,
+  {
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+  },
+  {
+    rules: {
+      "prettier/prettier": "warn",
+      "@docusaurus/string-literal-i18n-messages": "warn",
+      "@docusaurus/no-untranslated-text": "warn",
+      "@docusaurus/no-html-links": "warn",
+      "react/react-in-jsx-scope": "off"
+    },
+  },
+];
\ No newline at end of file
diff --git a/website/guides/01_cert-manager.mdx b/website/guides/01_cert-manager.mdx
index e65ebb7c8..c62abe53c 100644
--- a/website/guides/01_cert-manager.mdx
+++ b/website/guides/01_cert-manager.mdx
@@ -128,7 +128,7 @@ kubectl apply -f cluster-issuer.yaml
 ```
 
 Cert-manager creates an Ingress to validate the ACME challenge, if no Ingress controller is already installed in
-the cluster the [ingress-nginx controller](./ingress-nginx) can easily be installed with Glasskube.
+the cluster the [ingress-nginx controller](./02_ingress-nginx.mdx) can easily be installed with Glasskube.
 
 Further links about cert-manager:
 
diff --git a/website/guides/02_ingress-nginx.mdx b/website/guides/02_ingress-nginx.mdx
index ef8e6aa96..6fd7db197 100644
--- a/website/guides/02_ingress-nginx.mdx
+++ b/website/guides/02_ingress-nginx.mdx
@@ -142,7 +142,7 @@ spec:
 
 This Ingress tells the controller that all traffic to the domain "app.your-company.com" with a path prefix of "/" should be routed to a Service in the same namespace named "your-app".
 With the addition of a `cert-manager.io/cluster-issuer` annotation and `tls` block, it also instructs [cert-manager](https://cert-manager.io/) to issue a certificate for this domain name.
-To learn more about cert-manager, check out [our guide on how to install cert-manager using Glasskube](./cert-manager).
+To learn more about cert-manager, check out [our guide on how to install cert-manager using Glasskube](./01_cert-manager.mdx).
 
 Further links about ingress-nginx:
 
diff --git a/website/guides/04_kubectl-guide.mdx b/website/guides/04_kubectl-guide.mdx
index 32709a40a..bdd249bc7 100644
--- a/website/guides/04_kubectl-guide.mdx
+++ b/website/guides/04_kubectl-guide.mdx
@@ -433,7 +433,7 @@ Cluster package management with conventional package management tools can be a p
 #### Glasskube:
 With [Glasskube](https://github.com/glasskube/glasskube) all the pain points found in conventional package managers like helm are solved to ensure you have time to manage your workloads and not have to worry about managing your k8s package stack.
 
-<iframe width="560" height="315" src="https://www.youtube.com/embed/ONNUP7l7WJM?si=zx01laPT6yXu48sI" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
+<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/ONNUP7l7WJM?si=y3tJVPcbyn6O7epl" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
 
 ### Networking 🌐
 
diff --git a/website/package-lock.json b/website/package-lock.json
index 22ddf0d56..7941df863 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -23,7 +23,6 @@
         "@giscus/react": "^3.0.0",
         "@lottiefiles/react-lottie-player": "^3.5.3",
         "@mdx-js/react": "^3.0.0",
-        "asciinema-player": "3.8.0",
         "clsx": "^2.0.0",
         "docusaurus-plugin-matomo": "0.0.8",
         "posthog-docusaurus": "^2.0.0",
@@ -34,11 +33,21 @@
         "typewriter-effect": "^2.21.0"
       },
       "devDependencies": {
+        "@docusaurus/eslint-plugin": "^3.4.0",
         "@docusaurus/module-type-aliases": "3.4.0",
         "@docusaurus/tsconfig": "3.4.0",
         "@docusaurus/types": "3.4.0",
+        "@eslint/js": "^9.5.0",
+        "@types/eslint": "^8.56.10",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "typescript": "~5.5.0"
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-react": "^7.34.3",
+        "globals": "^15.6.0",
+        "prettier": "^3.3.2",
+        "typescript": "~5.5.0",
+        "typescript-eslint": "^7.14.1"
       },
       "engines": {
         "node": ">=18.0"
@@ -49,7 +58,6 @@
       "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
       "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1197,6 +1205,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-classes/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
@@ -2125,6 +2141,14 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/types": {
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
@@ -2297,6 +2321,22 @@
         "node": ">=18.0"
       }
     },
+    "node_modules/@docusaurus/eslint-plugin": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/eslint-plugin/-/eslint-plugin-3.4.0.tgz",
+      "integrity": "sha512-3Y9SwkxwY36TmsvZGyLZepifHbXIjZHMEFGuPcvtkFNnVgFIUkoAkf17GfwKKHnAloYVG/hpLV1m8q2BVKSLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.62.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=18.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=6"
+      }
+    },
     "node_modules/@docusaurus/logger": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.4.0.tgz",
@@ -2985,7 +3025,6 @@
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -3001,7 +3040,6 @@
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
       "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -3011,7 +3049,6 @@
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -3035,7 +3072,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3052,7 +3088,6 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -3067,15 +3102,13 @@
       "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==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -3084,13 +3117,13 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
-      "devOptional": true,
-      "peer": true,
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.6.0.tgz",
+      "integrity": "sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@fontsource/inter": {
@@ -3205,7 +3238,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
         "debug": "^4.3.1",
@@ -3220,7 +3252,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -3233,8 +3264,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
@@ -3668,6 +3698,18 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/@pnpm/config.env-replace": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
@@ -4108,9 +4150,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.2",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz",
-      "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==",
+      "version": "8.56.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
+      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4354,6 +4396,12 @@
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
       "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
     },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true
+    },
     "node_modules/@types/send": {
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
@@ -4420,154 +4468,683 @@
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.14.1.tgz",
+      "integrity": "sha512-aAJd6bIf2vvQRjUG3ZkNXkmBpN+J7Wd0mfQiiVCJMu9Z5GcZZdcc0j8XwN/BM97Fl7e3SkTXODSk4VehUv7CGw==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/type-utils": "7.14.1",
+        "@typescript-eslint/utils": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
+      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
+      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
+      "dev": true,
       "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz",
+      "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==",
+      "dev": true,
       "dependencies": {
-        "@xtuc/long": "4.2.2"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
+      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "@typescript-eslint/types": "7.14.1",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.14.1.tgz",
+      "integrity": "sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
+      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
+      "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@xtuc/long": "4.2.2"
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
     },
-    "node_modules/accepts": {
-      "version": "1.3.8",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
+      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
+      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.14.1.tgz",
+      "integrity": "sha512-/MzmgNd3nnbDbOi3LfasXWWe292+iuo+umJ0bCCMCPc1jLO/z2BQmWUUUXvXLbrQey/JgzdF/OV+I5bzEGwJkQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.14.1",
+        "@typescript-eslint/utils": "7.14.1",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
+      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
+      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz",
+      "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
+      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dependencies": {
@@ -4808,13 +5385,16 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4826,15 +5406,16 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -4852,6 +5433,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
@@ -4907,18 +5508,47 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+    "node_modules/array.prototype.toreversed": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz",
+      "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
         "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
         "is-shared-array-buffer": "^1.0.2"
       },
       "engines": {
@@ -4928,16 +5558,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asciinema-player": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/asciinema-player/-/asciinema-player-3.8.0.tgz",
-      "integrity": "sha512-yFoAcjFK9WJ0D+aagkT0YXOWRbyXoOe/TQHq07oQP6prItXQkWn46fdvUb6zqJu2AywmY8VjBEwZ6ciL8IbezQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0",
-        "solid-js": "^1.3.0"
-      }
-    },
     "node_modules/astring": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.6.tgz",
@@ -4991,10 +5611,13 @@
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -5342,13 +5965,18 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6813,6 +7441,57 @@
         "lodash-es": "^4.17.21"
       }
     },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/dayjs": {
       "version": "1.11.10",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
@@ -6888,8 +7567,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -6919,16 +7597,19 @@
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-lazy-prop": {
@@ -7111,7 +7792,6 @@
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -7325,50 +8005,57 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
         "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.3",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.13",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "which-typed-array": "^1.1.15"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7377,20 +8064,76 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-iterator-helpers": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
+      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
       "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="
     },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7458,17 +8201,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -7513,6 +8255,18 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
@@ -7599,19 +8353,128 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz",
+      "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.8.6"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.34.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz",
+      "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.toreversed": "^1.1.2",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.0.19",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.hasown": "^1.1.4",
+        "object.values": "^1.2.0",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.11"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
+    "node_modules/eslint-plugin-react/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
@@ -7637,7 +8500,6 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -7645,12 +8507,20 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "devOptional": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/eslint/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -7667,7 +8537,6 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -7684,7 +8553,6 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -7694,7 +8562,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -7711,7 +8578,6 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7724,7 +8590,6 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -7739,15 +8604,13 @@
       "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==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -7763,7 +8626,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -7779,7 +8641,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -7795,7 +8656,6 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -7805,7 +8665,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7818,7 +8677,6 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7831,7 +8689,6 @@
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -7861,7 +8718,6 @@
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -7874,7 +8730,6 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "devOptional": true,
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -8177,8 +9032,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
       "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "optional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/fast-fifo": {
       "version": "1.3.2",
@@ -8209,8 +9063,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/fast-url-parser": {
       "version": "1.1.3",
@@ -8267,7 +9120,6 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -8431,7 +9283,6 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -8445,8 +9296,7 @@
       "version": "3.2.9",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
       "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
@@ -8725,15 +9575,19 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -8755,13 +9609,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8886,11 +9741,16 @@
       }
     },
     "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.7.0.tgz",
+      "integrity": "sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/globalthis": {
@@ -8982,8 +9842,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/gray-matter": {
       "version": "4.0.3",
@@ -9056,20 +9915,20 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -9089,12 +9948,12 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9115,9 +9974,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -9662,9 +10521,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "engines": {
         "node": ">= 4"
       }
@@ -9769,12 +10628,12 @@
       "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
     },
     "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
+        "es-errors": "^1.3.0",
         "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       },
@@ -9837,14 +10696,16 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9855,6 +10716,21 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
     },
+    "node_modules/is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -9928,6 +10804,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-date-object": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
@@ -9982,6 +10873,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -9990,6 +10893,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -10025,10 +10943,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -10154,13 +11084,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -10208,12 +11153,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
       "dev": true,
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10227,6 +11172,18 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -10239,6 +11196,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-weakset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -10276,6 +11249,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
     "node_modules/jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -10417,8 +11403,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -10442,6 +11427,21 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -10520,7 +11520,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -10646,8 +11645,7 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
@@ -13503,8 +14501,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "devOptional": true,
-      "peer": true
+      "devOptional": true
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -13660,15 +14657,30 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/object.fromentries": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13689,15 +14701,32 @@
         "get-intrinsic": "^1.2.1"
       }
     },
+    "node_modules/object.hasown": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz",
+      "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13781,7 +14810,6 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
       "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
@@ -14149,6 +15177,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.38",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
@@ -14781,9 +15818,35 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "devOptional": true,
-      "peer": true,
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/pretty-error": {
@@ -15391,6 +16454,27 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
+      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.1",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -15421,14 +16505,15 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15908,13 +16993,13 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
-      "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -15951,13 +17036,13 @@
       ]
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz",
-      "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
       "engines": {
@@ -16039,12 +17124,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -16066,22 +17148,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/semver/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/semver/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/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -16139,25 +17205,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/seroval": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz",
-      "integrity": "sha512-qQs/N+KfJu83rmszFQaTxcoJoPn6KNUruX4KmnmyD0oZkUoiNvJ1rpdYKDf4YHM05k+HOgCxa3yvf15QbVijGg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/seroval-plugins": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.0.4.tgz",
-      "integrity": "sha512-DQ2IK6oQVvy8k+c2V5x5YCtUa/GGGsUwUBNN9UqohrZ0rWdUapBFpNMYP1bCyRHoxOJjdKGl+dieacFIpU/i1A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "seroval": "^1.0"
-      }
-    },
     "node_modules/serve-handler": {
       "version": "6.1.5",
       "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
@@ -16263,28 +17310,31 @@
       }
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16377,13 +17427,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -16529,16 +17583,6 @@
         "websocket-driver": "^0.7.4"
       }
     },
-    "node_modules/solid-js": {
-      "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.12.tgz",
-      "integrity": "sha512-sLE/i6M9FSWlov3a2pTC5ISzanH2aKwqXTZj+bbFt4SUrVb4iGEa7fpILBMOxsQjkv3eXqEk6JVLlogOdTe0UQ==",
-      "dependencies": {
-        "csstype": "^3.1.0",
-        "seroval": "^1.0.3",
-        "seroval-plugins": "^1.0.3"
-      }
-    },
     "node_modules/sort-css-media-queries": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.2.0.tgz",
@@ -16704,15 +17748,42 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
+      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "regexp.prototype.flags": "^1.5.2",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16722,28 +17793,31 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -16909,6 +17983,22 @@
         "node": ">= 10"
       }
     },
+    "node_modules/synckit": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz",
+      "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==",
+      "dev": true,
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -17149,6 +18239,18 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "node_modules/ts-dedent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
@@ -17186,6 +18288,27 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -17202,7 +18325,6 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "devOptional": true,
-      "peer": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -17253,29 +18375,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17285,16 +18408,17 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -17304,14 +18428,20 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -17338,6 +18468,153 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.14.1.tgz",
+      "integrity": "sha512-Eo1X+Y0JgGPspcANKjeR6nIqXl4VL5ldXLc15k4m9upq+eY5fhU2IueiEZL6jmHrKH8aCfbIvM/v3IrX5Hg99w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "7.14.1",
+        "@typescript-eslint/parser": "7.14.1",
+        "@typescript-eslint/utils": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
+      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
+      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz",
+      "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
+      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.14.1",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/typewriter-effect": {
       "version": "2.21.0",
       "resolved": "https://registry.npmjs.org/typewriter-effect/-/typewriter-effect-2.21.0.tgz",
@@ -18263,17 +19540,67 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/which-builtin-type": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
+      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
+      "dev": true,
+      "dependencies": {
+        "function.prototype.name": "^1.1.5",
+        "has-tostringtag": "^1.0.0",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
diff --git a/website/package.json b/website/package.json
index fb6d4d9e0..ff8348fce 100644
--- a/website/package.json
+++ b/website/package.json
@@ -12,7 +12,10 @@
     "serve": "docusaurus serve",
     "write-translations": "docusaurus write-translations",
     "write-heading-ids": "docusaurus write-heading-ids",
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
+    "format": "prettier --write ."
   },
   "dependencies": {
     "@docusaurus/core": "3.4.0",
@@ -30,7 +33,6 @@
     "@giscus/react": "^3.0.0",
     "@lottiefiles/react-lottie-player": "^3.5.3",
     "@mdx-js/react": "^3.0.0",
-    "asciinema-player": "3.8.0",
     "clsx": "^2.0.0",
     "docusaurus-plugin-matomo": "0.0.8",
     "posthog-docusaurus": "^2.0.0",
@@ -41,11 +43,21 @@
     "typewriter-effect": "^2.21.0"
   },
   "devDependencies": {
+    "@docusaurus/eslint-plugin": "^3.4.0",
     "@docusaurus/module-type-aliases": "3.4.0",
     "@docusaurus/tsconfig": "3.4.0",
     "@docusaurus/types": "3.4.0",
+    "@eslint/js": "^9.5.0",
+    "@types/eslint": "^8.56.10",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "typescript": "~5.5.0"
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react": "^7.34.3",
+    "globals": "^15.6.0",
+    "prettier": "^3.3.2",
+    "typescript": "~5.5.0",
+    "typescript-eslint": "^7.14.1"
   },
   "browserslist": {
     "production": [
diff --git a/website/src/components/Home/index.tsx b/website/src/components/Home/index.tsx
index ce6bd9110..e28d9bb62 100644
--- a/website/src/components/Home/index.tsx
+++ b/website/src/components/Home/index.tsx
@@ -9,7 +9,6 @@ import styles from './index.module.css';
 import React from 'react';
 import Typewriter from 'typewriter-effect';
 import BrowserOnly from '@docusaurus/BrowserOnly';
-import AsciinemaPlayer from '@site/src/components/asciinema-player';
 import HomepageScreenshots from '@site/src/components/HomepageScreenshots';
 import TalkToFoundersButton from '@site/src/components/buttons/TalkToFoundersButton';
 import SignupForWaitlistButton from '@site/src/components/buttons/SignupForWaitlistButton';
@@ -110,14 +109,9 @@ function HomepageVideo() {
         <div className="row">
           <div className="col col--8 col--offset-2 margin-vert--lg">
             <Heading as={'h2'} className={styles.colorWhite}>
-              Learn how to install cert-manager in less than 2 minutes using Glasskube
+              Learn how to use Glasskube in less than 2 minutes
             </Heading>
-            <AsciinemaPlayer
-              src='/cast/634355.cast'
-              rows='22'
-              idleTimeLimit={7}
-              poster='npt:0:19'
-              controls={false}/>
+            <iframe width="100%" height="460" src="https://www.youtube-nocookie.com/embed/aIeTHGWsG2c?si=KUcqvY4coU89GmdK" title="YouTube video player" frameBorder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerPolicy="strict-origin-when-cross-origin" allowFullScreen></iframe>
           </div>
         </div>
       </div>
diff --git a/website/src/components/asciinema-player.tsx b/website/src/components/asciinema-player.tsx
deleted file mode 100644
index 5c1f78d73..000000000
--- a/website/src/components/asciinema-player.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import 'asciinema-player/dist/bundle/asciinema-player.css';
-
-type AsciinemaPlayerProps = {
-  src: string;
-  // START asciinemaOptions
-  cols?: string;
-  rows?: string;
-  autoPlay?: boolean
-  preload?: boolean;
-  loop?: boolean | number;
-  startAt?: number | string;
-  speed?: number;
-  idleTimeLimit?: number;
-  theme?: string;
-  poster?: string;
-  fit?: string;
-  terminalFontSize?: string;
-  controls?: boolean | 'auto';
-  // END asciinemaOptions
-};
-
-export default function AsciinemaPlayer({ src, ...asciinemaOptions }: AsciinemaPlayerProps) {
-  const ref = useRef<HTMLDivElement>(null);
-  const [player, setPlayer] = useState<any>()
-  useEffect(() => {
-    import("asciinema-player").then(p => { setPlayer(p) })
-  }, [])
-  useEffect(() => {
-    const currentRef = ref.current
-    const instance = player?.create(src, currentRef, asciinemaOptions);
-    return () => { instance?.dispose() }
-  }, [src, player, asciinemaOptions]);
-
-  return <div ref={ref} />;
-}
diff --git a/website/src/partials/_install.mdx b/website/src/partials/_install.mdx
index f130ba237..88f9fd2b5 100644
--- a/website/src/partials/_install.mdx
+++ b/website/src/partials/_install.mdx
@@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem';
 
       {/* x-release-please-start-version */}
       ```
-      dnf install https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.rpm
+      dnf install https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.rpm
       ```
       {/* x-release-please-end */}
     </details>
@@ -25,8 +25,8 @@ import TabItem from '@theme/TabItem';
 
       {/* x-release-please-start-version */}
       ```
-      curl -LO https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.deb
-      sudo dpkg -i glasskube_v0.10.1_amd64.deb
+      curl -LO https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.deb
+      sudo dpkg -i glasskube_v0.11.0_amd64.deb
       ```
       {/* x-release-please-end */}
     </details>
@@ -35,7 +35,7 @@ import TabItem from '@theme/TabItem';
       <summary>APK-based installation (Alpine)</summary>
       {/* x-release-please-start-version */}
       ```
-      curl -LO https://releases.dl.glasskube.dev/glasskube_v0.10.1_amd64.apk
+      curl -LO https://releases.dl.glasskube.dev/glasskube_v0.11.0_amd64.apk
       apk add glasskube.apk
       ```
       {/* x-release-please-end */}
@@ -47,7 +47,7 @@ import TabItem from '@theme/TabItem';
 
   <TabItem value="win" label="Windows">
     {/* x-release-please-start-version */}
-    Download the [windows archive](https://releases.dl.glasskube.dev/glasskube_v0.10.1_windows_x86_64.zip) from our
+    Download the [windows archive](https://releases.dl.glasskube.dev/glasskube_v0.11.0_windows_x86_64.zip) from our
     latest [Release](https://github.com/glasskube/glasskube/releases/latest) and unpack it using Windows Explorer.
     {/* x-release-please-end */}
   </TabItem>
diff --git a/website/static/release.json b/website/static/release.json
index fdb2d86b0..33e4f2840 100644
--- a/website/static/release.json
+++ b/website/static/release.json
@@ -1 +1 @@
-{"version":"0.10.1"}
+{"version":"0.11.0"}
diff --git a/website/static/schemas/v1/index.json b/website/static/schemas/v1/index.json
index 55d3fcc22..8e4614806 100644
--- a/website/static/schemas/v1/index.json
+++ b/website/static/schemas/v1/index.json
@@ -15,6 +15,9 @@
         },
         "latestVersion": {
           "type": "string"
+        },
+        "scope": {
+          "$ref": "#/$defs/PackageScope"
         }
       },
       "additionalProperties": false,
@@ -22,6 +25,12 @@
       "required": [
         "name"
       ]
+    },
+    "PackageScope": {
+      "enum": [
+        "Cluster",
+        "Namespaced"
+      ]
     }
   },
   "properties": {