diff --git a/README.md b/README.md
index acf3e66e7..78e72f185 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ ClassifAI is a sophisticated solution that we want organizations of all shapes a
 - Check for an email from `ClassifAI Team` which contains the registration key.
 - Note that the email will be sent from `opensource@10up.com`, so please whitelist this email address if needed.
 
-### 2. Configure ClassifAI Registration Key under Tools > ClassifAI
+### 2. Configure ClassifAI Registration Key under Tools > ClassifAI > ClassifAI Registration
 
 - In the `Registered Email` field, enter the email you used for registration.
 - In the `Registration Key` field, enter the registration key from the email in step 1 above.
@@ -164,7 +164,7 @@ ClassifAI is a sophisticated solution that we want organizations of all shapes a
 - Log into your account (accepting the privacy policy) and create a new [*Natural Language Understanding*](https://cloud.ibm.com/catalog/services/natural-language-understanding) Resource if you do not already have one. It may take a minute for your account to fully populate with the default resource group to use.
 - Click `Manage` in the left hand menu, then `Show credentials` on the Manage page to view the credentials for this resource.
 
-### 2. Configure IBM Watson API Keys under Tools > ClassifAI > Language Processing > Classification
+### 2. Configure IBM Watson API Keys under Tools > ClassifAI > Language Processing > Classification > Settings
 
 - Select **IBM Watson NLU** in the provider dropdown.
 
@@ -191,7 +191,7 @@ For more information, see https://cloud.ibm.com/docs/watson?topic=watson-endpoin
 
 IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understanding?topic=natural-language-understanding-about#categories), [Keywords](https://cloud.ibm.com/docs/natural-language-understanding?topic=natural-language-understanding-about#keywords), [Concepts](https://cloud.ibm.com/docs/natural-language-understanding?topic=natural-language-understanding-about#concepts) & [Entities](https://cloud.ibm.com/docs/natural-language-understanding?topic=natural-language-understanding-about#entities) can each be stored in existing WordPress taxonomies or a custom Watson taxonomy.
 
-### 3. Configure Post Types to classify and IBM Watson Features to enable under ClassifAI > Language Processing > Classification
+### 3. Configure Post Types to classify and IBM Watson Features to enable under ClassifAI > Language Processing > Classification > Settings
 
 - Choose which public post types to classify when saved.
 - Choose whether to assign category, keyword, entity, and concept as well as the thresholds and taxonomies used for each.
@@ -207,7 +207,7 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing > Settings
 
 * Select **OpenAI ChatGPT** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
@@ -215,7 +215,7 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 ### 3. Enable specific Language Processing feature settings
 
 * For each feature, set any options as needed.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Edit a content type to test enabled features
 
@@ -241,7 +241,7 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 * Click `Keys and Endpoint` in the left hand Resource Management menu to get the endpoint for this resource.
 * Click the copy icon next to `KEY 1` to copy the API Key credential for this resource.
 
-### 2. Configure API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing
+### 2. Configure API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing > Settings
 
 * Select **Azure OpenAI** in the provider dropdown.
 * Enter your endpoint you copied from the above step into the `Endpoint URL` field.
@@ -250,9 +250,9 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 
 ### 3. Enable specific Language Processing features
 
-* Check the "Enable" checkbox in above screen.
+* Turn on the "Enable" toggle in the screen above.
 * Set the other options as needed.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Edit a content type to test enabled features
 
@@ -276,16 +276,16 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 * Note that if this page doesn't work, it's likely that Gemini is not enabled in your workspace. Contact your workspace administrator to get this enabled.
 * Click `Create API key` and copy the key that is shown.
 
-### 2. Configure API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing
+### 2. Configure API Keys under Tools > ClassifAI > Language Processing > Title Generation, Excerpt Generation or Content Resizing > Settings
 
 * Select **Google AI (Gemini API)** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
 
 ### 3. Enable specific Language Processing features
 
-* Check the "Enable" checkbox in above screen.
+* Turn on the "Enable" toggle in the screen above.
 * Set the other options as needed.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Edit a content type to test enabled features
 
@@ -309,7 +309,7 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Classification
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Classification > Settings
 
 * Select **OpenAI Embeddings** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
@@ -318,7 +318,7 @@ IBM Watson's [Categories](https://cloud.ibm.com/docs/natural-language-understand
 
 * Choose to automatically classify content.
 * Set the other options as needed.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Edit a content item
 
@@ -340,7 +340,7 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Audio Transcripts Generation
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Audio Transcripts Generation > Settings
 
 * Select **OpenAI Embeddings** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
@@ -349,7 +349,7 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 
 * Choose to enable the ability to automatically generate transcripts from supported audio files.
 * Choose which user roles have access to this ability.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Upload a new audio file
 
@@ -365,12 +365,12 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 * Click `Keys and Endpoint` in the left hand Resource Management menu to view the `Location/Region` for this resource.
 * Click the copy icon next to `KEY 1` to copy the API Key credential for this resource.
 
-### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Language Processing > Text to Speech
+### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Language Processing > Text to Speech > Settings
 
 * Select **Microsoft Azure AI Speech** in the provider dropdown.
 * In the `Endpoint URL` field, enter the following URL, replacing `LOCATION` with the `Location/Region` you found above: `https://LOCATION.tts.speech.microsoft.com/`.
 * In the `API Key` field, enter your `KEY 1` copied from above.
-* Click **Save Changes** (the page will reload).
+* Click **Save Settings**.
 * If connected successfully, a new dropdown with the label "Voices" will be displayed.
 * Select a voice as per your choice.
 * Select a post type that should use this service.
@@ -391,7 +391,7 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Text to Speech
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Text to Speech > Settings
 
 * Select **OpenAI Text to Speech** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
@@ -425,14 +425,14 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 * On the **Retrieve access key** page, choose **Show** to reveal the value of your user's secret access key.
 * Copy and save the credentials in a secure location on your computer or click "Download .csv file" to save the access key ID and secret access key to a `.csv` file.
 
-### 2. Configure AWS credentials under Tools > ClassifAI > Language Processing > Text to Speech
+### 2. Configure AWS credentials under Tools > ClassifAI > Language Processing > Text to Speech > Settings
 
 * Select **Amazon Polly** in the provider dropdown.
 * In the `AWS access key` field, enter the `Access key
 ` copied from above.
 * In the `AWS secret access key` field, enter your `Secret access key` copied from above.
 * In the `AWS Region` field, enter your AWS region value eg: `us-east-1`
-* Click **Save Changes** (the page will reload).
+* Click **Save Settings**.
 * If connected successfully, a new dropdown with the label "Voices" will be displayed.
 * Select a voice and voice engine as per your choice.
 * Select a post type that should use this service.
@@ -452,7 +452,7 @@ Note that [OpenAI](https://platform.openai.com/docs/guides/speech-to-text) can c
 * Once you've chosen a Provider, you'll need to create an account and get authentication details.
   * When setting things up on the Azure side, ensure you choose either the `text-embedding-3-small` or `text-embedding-3-large` model. The Feature will not work with other models.
 
-### 2. Configure Settings under Tools > ClassifAI > Language Processing > Smart 404
+### 2. Configure Settings under Tools > ClassifAI > Language Processing > Smart 404 > Settings
 
 * Select the proper Provider in the provider dropdown.
 * Enter your authentication details.
@@ -571,7 +571,7 @@ This will download, install and start Elasticsearch v7.9.0 to your local machine
 * Once you've chosen a Provider, you'll need to create an account and get authentication details.
   * When setting things up on the Azure side, ensure you choose either the `text-embedding-3-small` or `text-embedding-3-large` model. The Feature will not work with other models.
 
-### 2. Configure Settings under Tools > ClassifAI > Language Processing > Term Cleanup
+### 2. Configure Settings under Tools > ClassifAI > Language Processing > Term Cleanup > Settings
 
 * Select the proper Provider in the provider dropdown.
 * Enter your authentication details.
@@ -618,7 +618,7 @@ Note that [Azure AI Vision](https://docs.microsoft.com/en-us/azure/cognitive-ser
 - Click `Keys and Endpoint` in the left hand Resource Management menu to view the `Endpoint` URL for this resource.
 - Click the copy icon next to `KEY 1` to copy the API Key credential for this resource.
 
-### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Image Processing > Descriptive Text Generator, Image Tags Generator, Image Cropping, Image Text Extraction or PDF Text Extraction
+### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Image Processing > Descriptive Text Generator, Image Tags Generator, Image Cropping, Image Text Extraction or PDF Text Extraction > Settings
 
 - Select **Microsoft Azure AI Vision** in the provider dropdown.
 - In the `Endpoint URL` field, enter your `API endpoint`.
@@ -640,7 +640,7 @@ Note that [Azure AI Vision](https://docs.microsoft.com/en-us/azure/cognitive-ser
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Image Processing > Image Generation
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Image Processing > Image Generation > Settings
 
 * Select **OpenAI DALL·E 3** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
@@ -649,7 +649,7 @@ Note that [Azure AI Vision](https://docs.microsoft.com/en-us/azure/cognitive-ser
 
 * Choose to add the ability to generate images.
 * If image generation is configured, set the other options as needed.
-* Save changes and ensure a success message is shown. An error will show if API authentication fails.
+* Save settings. An error will show if API authentication fails.
 
 ### 4. Trigger the media flow within a content item
 
@@ -669,14 +669,14 @@ Note that [Azure AI Vision](https://docs.microsoft.com/en-us/azure/cognitive-ser
 * Log into your account and go to the [API key page](https://platform.openai.com/account/api-keys).
 * Click `Create new secret key` and copy the key that is shown.
 
-### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Moderation
+### 2. Configure OpenAI API Keys under Tools > ClassifAI > Language Processing > Moderation >  > Settings
 
 * Select **OpenAI Moderation** in the provider dropdown.
 * Enter your API Key copied from the above step into the `API Key` field.
 
 ### 3. Enable Comment Moderation
 
-* Select the "Enable" checkbox in above screen.
+* Turn on the "Enable" toggle in the screen above.
 * Select "Comments" in the "Content to moderate" section.
 
 ## Set Up Recommended Content (via Microsoft Azure AI Personalizer)
@@ -697,7 +697,7 @@ Note that [Personalizer](https://azure.microsoft.com/en-us/services/cognitive-se
 
 For more information, see https://docs.microsoft.com/en-us/azure/cognitive-services/personalizer/how-to-create-resource
 
-### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Recommended Content
+### 2. Configure Microsoft Azure API and Key under Tools > ClassifAI > Recommended Content Service > Settings
 
 - In the `Endpoint URL` field, enter your `Endpoint` URL from Step 1 above.
 - In the `API Key` field, enter your `KEY 1` from Step 1 above.
diff --git a/assets/img/screenshot-6.png b/assets/img/screenshot-6.png
index 9117400ae..0210df30b 100644
Binary files a/assets/img/screenshot-6.png and b/assets/img/screenshot-6.png differ
diff --git a/includes/Classifai/Admin/Notifications.php b/includes/Classifai/Admin/Notifications.php
index 60f51ebc2..93e70eafd 100644
--- a/includes/Classifai/Admin/Notifications.php
+++ b/includes/Classifai/Admin/Notifications.php
@@ -87,7 +87,7 @@ public function render_activation_notice() {
 			return;
 		}
 
-		$setup_url = admin_url( 'tools.php?page=classifai#/classifai_setup' );
+		$setup_url = admin_url( 'tools.php?page=classifai#/language_processing?welcome_guide=1' );
 		if ( should_use_legacy_settings_panel() ) {
 			$setup_url = admin_url( 'admin.php?page=classifai_setup' );
 		}
@@ -101,11 +101,12 @@ public function render_activation_notice() {
 				<div class="classifai-logo">
 					<img src="<?php echo esc_url( CLASSIFAI_PLUGIN_URL . 'assets/img/classifai.png' ); ?>" alt="<?php esc_attr_e( 'ClassifAI', 'classifai' ); ?>" />
 				</div>
-				<h3 class="classifai-activation-message">
-					<?php esc_html_e( 'Congratulations, the ClassifAI plugin is now activated.', 'classifai' ); ?>
-				</h3>
-				<a class="classifai-button" href="<?php echo esc_url( $setup_url ); ?>">
-					<?php esc_html_e( 'Start setup', 'classifai' ); ?>
+				<div class="classifai-activation-message">
+					<p><?php esc_html_e( 'Thanks for downloading ClassifAI.', 'classifai' ); ?></p>
+					<p><?php esc_html_e( 'Choose your Features, connect your AI Provider accounts, and you’re ready to go.', 'classifai' ); ?></p>
+				</div>
+				<a class="components-button is-primary" href="<?php echo esc_url( $setup_url ); ?>">
+					<?php esc_html_e( 'Get started', 'classifai' ); ?>
 				</a>
 			</div>
 		</div>
diff --git a/includes/Classifai/Admin/templates/classifai-header.php b/includes/Classifai/Admin/templates/classifai-header.php
index b3a54a014..33601f7aa 100644
--- a/includes/Classifai/Admin/templates/classifai-header.php
+++ b/includes/Classifai/Admin/templates/classifai-header.php
@@ -24,8 +24,8 @@
 			if ( $is_setup_page ) {
 				?>
 				<div class="header-control-item">
-					<a href="<?php echo esc_url( admin_url( 'tools.php?page=classifai' ) ); ?>" class="classifai-help-links">
-						<span class="dashicons dashicons-admin-generic"></span>
+					<a class="components-button has-text has-icon" href="<?php echo esc_url( admin_url( 'tools.php?page=classifai' ) ); ?>" >
+						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path fill-rule="evenodd" d="M10.289 4.836A1 1 0 0111.275 4h1.306a1 1 0 01.987.836l.244 1.466c.787.26 1.503.679 2.108 1.218l1.393-.522a1 1 0 011.216.437l.653 1.13a1 1 0 01-.23 1.273l-1.148.944a6.025 6.025 0 010 2.435l1.149.946a1 1 0 01.23 1.272l-.653 1.13a1 1 0 01-1.216.437l-1.394-.522c-.605.54-1.32.958-2.108 1.218l-.244 1.466a1 1 0 01-.987.836h-1.306a1 1 0 01-.986-.836l-.244-1.466a5.995 5.995 0 01-2.108-1.218l-1.394.522a1 1 0 01-1.217-.436l-.653-1.131a1 1 0 01.23-1.272l1.149-.946a6.026 6.026 0 010-2.435l-1.148-.944a1 1 0 01-.23-1.272l.653-1.131a1 1 0 011.217-.437l1.393.522a5.994 5.994 0 012.108-1.218l.244-1.466zM14.929 12a3 3 0 11-6 0 3 3 0 016 0z" clip-rule="evenodd"></path></svg>
 						<span class="control-item-text"><?php esc_html_e( 'Settings', 'classifai' ); ?></span>
 					</a>
 				</div>
@@ -33,8 +33,8 @@
 			} else {
 				?>
 				<div class="header-control-item">
-					<a href="<?php echo esc_url( admin_url( 'admin.php?page=classifai_setup' ) ); ?>" class="classifai-help-links">
-						<span class="dashicons dashicons-admin-tools"></span>
+					<a class="components-button has-text has-icon" href="<?php echo esc_url( admin_url( 'admin.php?page=classifai_setup' ) ); ?>">
+						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M14.103 7.128l2.26-2.26a4 4 0 00-5.207 4.804L5.828 15a2 2 0 102.828 2.828l5.329-5.328a4 4 0 004.804-5.208l-2.261 2.26-1.912-.512-.513-1.912zm-7.214 9.64a.5.5 0 11.707-.707.5.5 0 01-.707.707z"></path></svg>
 						<span class="control-item-text"><?php esc_html_e( 'Set up', 'classifai' ); ?></span>
 					</a>
 				</div>
@@ -42,10 +42,10 @@
 			}
 			?>
 			<div class="header-control-item">
-				<a href="#" class="classifai-help-links classifai-help">
-					<span class="dashicons dashicons-editor-help"></span>
-					<span class="control-item-text"><?php esc_html_e( 'Help', 'classifai' ); ?></span>
-				</a>
+				<button type="button" class="components-button has-text has-icon classifai-help-links classifai-help">
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M12 4.75a7.25 7.25 0 100 14.5 7.25 7.25 0 000-14.5zM3.25 12a8.75 8.75 0 1117.5 0 8.75 8.75 0 01-17.5 0zM12 8.75a1.5 1.5 0 01.167 2.99c-.465.052-.917.44-.917 1.01V14h1.5v-.845A3 3 0 109 10.25h1.5a1.5 1.5 0 011.5-1.5zM11.25 15v1.5h1.5V15h-1.5z"></path></svg>
+					<?php esc_html_e( 'Help', 'classifai' ); ?>
+				</button>
 				<template id="help-menu-template">
 					<div class="classifai-help-menu">
 						<a class="classifai-help-menu__menu-item" target="_blank" rel="noopener noreferrer" href="https://github.com/10up/classifai#frequently-asked-questions"><?php esc_html_e( 'FAQs', 'classifai' ); ?></a>
@@ -68,6 +68,7 @@
 
 $classifai_header_menu = array_merge( $classifai_settings, $services_menu );
 ?>
+<div class="classifai-settings-wrapper">
 <h2 class="nav-tab-wrapper classifai-nav-wrapper">
 	<?php
 	foreach ( $classifai_header_menu as $key => $value ) {
diff --git a/includes/Classifai/Features/ContentResizing.php b/includes/Classifai/Features/ContentResizing.php
index 431005e89..7428ed408 100644
--- a/includes/Classifai/Features/ContentResizing.php
+++ b/includes/Classifai/Features/ContentResizing.php
@@ -273,6 +273,37 @@ public function get_feature_default_settings(): array {
 		];
 	}
 
+	/**
+	 * Returns the settings for the feature.
+	 *
+	 * @param string $index The index of the setting to return.
+	 * @return array|mixed
+	 */
+	public function get_settings( $index = false ) {
+		$settings = parent::get_settings( $index );
+
+		// Keep using the original prompt from the codebase to allow updates.
+		if ( $settings && ! empty( $settings['condense_text_prompt'] ) ) {
+			foreach ( $settings['condense_text_prompt'] as $key => $prompt ) {
+				if ( 1 === intval( $prompt['original'] ) ) {
+					$settings['condense_text_prompt'][ $key ]['prompt'] = $this->condense_prompt;
+					break;
+				}
+			}
+		}
+
+		if ( $settings && ! empty( $settings['expand_text_prompt'] ) ) {
+			foreach ( $settings['expand_text_prompt'] as $key => $prompt ) {
+				if ( 1 === intval( $prompt['original'] ) ) {
+					$settings['expand_text_prompt'][ $key ]['prompt'] = $this->expand_prompt;
+					break;
+				}
+			}
+		}
+
+		return $settings;
+	}
+
 	/**
 	 * Sanitizes the default feature settings.
 	 *
diff --git a/includes/Classifai/Features/DescriptiveTextGenerator.php b/includes/Classifai/Features/DescriptiveTextGenerator.php
index 180410194..d948b188d 100644
--- a/includes/Classifai/Features/DescriptiveTextGenerator.php
+++ b/includes/Classifai/Features/DescriptiveTextGenerator.php
@@ -390,6 +390,28 @@ public function get_feature_default_settings(): array {
 		];
 	}
 
+	/**
+	 * Returns the settings for the feature.
+	 *
+	 * @param string $index The index of the setting to return.
+	 * @return array|mixed
+	 */
+	public function get_settings( $index = false ) {
+		$settings = parent::get_settings( $index );
+
+		// Keep using the original prompt from the codebase to allow updates.
+		if ( $settings && ! empty( $settings[ ChatGPT::ID ]['prompt'] ) ) {
+			foreach ( $settings[ ChatGPT::ID ]['prompt'] as $key => $prompt ) {
+				if ( 1 === intval( $prompt['original'] ) ) {
+					$settings[ ChatGPT::ID ]['prompt'][ $key ]['prompt'] = $this->prompt;
+					break;
+				}
+			}
+		}
+
+		return $settings;
+	}
+
 	/**
 	 * Sanitizes the default feature settings.
 	 *
diff --git a/includes/Classifai/Features/ExcerptGeneration.php b/includes/Classifai/Features/ExcerptGeneration.php
index 15ec70e6e..e9b892c68 100644
--- a/includes/Classifai/Features/ExcerptGeneration.php
+++ b/includes/Classifai/Features/ExcerptGeneration.php
@@ -344,6 +344,28 @@ public function get_feature_default_settings(): array {
 		];
 	}
 
+	/**
+	 * Returns the settings for the feature.
+	 *
+	 * @param string $index The index of the setting to return.
+	 * @return array|mixed
+	 */
+	public function get_settings( $index = false ) {
+		$settings = parent::get_settings( $index );
+
+		// Keep using the original prompt from the codebase to allow updates.
+		if ( $settings && ! empty( $settings['generate_excerpt_prompt'] ) ) {
+			foreach ( $settings['generate_excerpt_prompt'] as $key => $prompt ) {
+				if ( 1 === intval( $prompt['original'] ) ) {
+					$settings['generate_excerpt_prompt'][ $key ]['prompt'] = $this->prompt;
+					break;
+				}
+			}
+		}
+
+		return $settings;
+	}
+
 	/**
 	 * Sanitizes the default feature settings.
 	 *
diff --git a/includes/Classifai/Features/Feature.php b/includes/Classifai/Features/Feature.php
index e9e76360f..fd265e7b1 100644
--- a/includes/Classifai/Features/Feature.php
+++ b/includes/Classifai/Features/Feature.php
@@ -361,6 +361,11 @@ public function get_settings( $index = false ) {
 		$settings = get_option( $this->get_option_name(), [] );
 		$settings = $this->merge_settings( (array) $settings, (array) $defaults );
 
+		// If saved provider is not supported anymore, reset it.
+		if ( ! in_array( $settings['provider'], array_keys( $this->get_providers() ), true ) ) {
+			$settings['provider'] = '';
+		}
+
 		if ( $index && isset( $settings[ $index ] ) ) {
 			return $settings[ $index ];
 		}
diff --git a/includes/Classifai/Features/TermCleanup.php b/includes/Classifai/Features/TermCleanup.php
index 106e9935c..1b630b77f 100644
--- a/includes/Classifai/Features/TermCleanup.php
+++ b/includes/Classifai/Features/TermCleanup.php
@@ -177,64 +177,66 @@ public function render_settings_page() {
 			}
 			?>
 
-			<div class="classifai-wrap wrap classifai classifai-term-cleanup">
-				<h2><?php esc_html_e( 'Term Cleanup', 'classifai' ); ?></h2>
-				<h2 class="nav-tab-wrapper">
-					<?php
-					foreach ( $taxonomies as $name ) {
-						// If we don't have an active taxonomy, set the first one as active.
-						if ( ! $active_tax ) {
-							$active_tax = $name;
-						}
-
-						$label  = $all_taxonomies[ $name ];
-						$active = $active_tax === $name ? 'nav-tab-active' : '';
-						$url    = add_query_arg( 'tax', $name, $this->setting_page_url );
-						?>
+			<div class="classifai-settings-wrapper">
+				<div class="classifai-wrap wrap classifai classifai-term-cleanup">
+					<h2><?php esc_html_e( 'Term Cleanup', 'classifai' ); ?></h2>
+					<h2 class="nav-tab-wrapper">
+						<?php
+						foreach ( $taxonomies as $name ) {
+							// If we don't have an active taxonomy, set the first one as active.
+							if ( ! $active_tax ) {
+								$active_tax = $name;
+							}
+
+							$label  = $all_taxonomies[ $name ];
+							$active = $active_tax === $name ? 'nav-tab-active' : '';
+							$url    = add_query_arg( 'tax', $name, $this->setting_page_url );
+							?>
 
-						<a href="<?php echo esc_url( $url ); ?>" class="nav-tab <?php echo esc_attr( $active ); ?>">
-							<?php echo esc_html( $label ); ?>
-						</a>
+							<a href="<?php echo esc_url( $url ); ?>" class="nav-tab <?php echo esc_attr( $active ); ?>">
+								<?php echo esc_html( $label ); ?>
+							</a>
 
-						<?php
-					}
-					?>
-				</h2>
-				<div class="classifai-term-cleanup-wrapper classifai-wrapper">
-					<div class="classifai-term-cleanup-content-wrapper">
-						<h3 class="screen-reader-text"><?php echo esc_html( $all_taxonomies[ $active_tax ] ); ?></h3>
-					<?php
-					if ( $this->background_process && $this->background_process->in_progress() ) {
-						$this->render_background_processing_status( $active_tax );
-					} else {
-						$plural_label   = strtolower( $this->get_taxonomy_label( $active_tax, true ) );
-						$singular_label = strtolower( $this->get_taxonomy_label( $active_tax, false ) );
-
-						// translators: %s: Taxonomy name.
-						$submit_label = sprintf( __( 'Find similar %s', 'classifai' ), esc_attr( $plural_label ) );
-						?>
-						<p>
 							<?php
+						}
+						?>
+					</h2>
+					<div class="classifai-term-cleanup-wrapper classifai-wrapper">
+						<div class="classifai-term-cleanup-content-wrapper">
+							<h3 class="screen-reader-text"><?php echo esc_html( $all_taxonomies[ $active_tax ] ); ?></h3>
+						<?php
+						if ( $this->background_process && $this->background_process->in_progress() ) {
+							$this->render_background_processing_status( $active_tax );
+						} else {
+							$plural_label   = strtolower( $this->get_taxonomy_label( $active_tax, true ) );
+							$singular_label = strtolower( $this->get_taxonomy_label( $active_tax, false ) );
+
 							// translators: %s: Taxonomy name.
-							printf( esc_html__( 'Identify potential %s duplicates to merge together', 'classifai' ), esc_html( $singular_label ) );
+							$submit_label = sprintf( __( 'Find similar %s', 'classifai' ), esc_attr( $plural_label ) );
 							?>
-						</p>
-						<div class="submit-wrapper">
-							<form action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" method="post">
-								<input type="hidden" name="action" value="classifai_init_term_cleanup" />
-								<input type="hidden" name="classifai_term_cleanup_taxonomy" value="<?php echo esc_attr( $active_tax ); ?>" />
-								<?php wp_nonce_field( 'classifai_term_cleanup', 'classifai_term_cleanup_nonce' ); ?>
-								<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php echo esc_attr( $submit_label ); ?>">
-							</form>
-						</div>
-						<?php
-					}
-					?>
-						<div>
-							<br/>
+							<p>
+								<?php
+								// translators: %s: Taxonomy name.
+								printf( esc_html__( 'Identify potential %s duplicates to merge together', 'classifai' ), esc_html( $singular_label ) );
+								?>
+							</p>
+							<div class="submit-wrapper">
+								<form action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" method="post">
+									<input type="hidden" name="action" value="classifai_init_term_cleanup" />
+									<input type="hidden" name="classifai_term_cleanup_taxonomy" value="<?php echo esc_attr( $active_tax ); ?>" />
+									<?php wp_nonce_field( 'classifai_term_cleanup', 'classifai_term_cleanup_nonce' ); ?>
+									<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php echo esc_attr( $submit_label ); ?>">
+								</form>
+							</div>
 							<?php
-							$this->render_similar_terms( $active_tax );
-							?>
+						}
+						?>
+							<div>
+								<br/>
+								<?php
+								$this->render_similar_terms( $active_tax );
+								?>
+							</div>
 						</div>
 					</div>
 				</div>
diff --git a/includes/Classifai/Features/TitleGeneration.php b/includes/Classifai/Features/TitleGeneration.php
index a86d74388..8de7cf8f2 100644
--- a/includes/Classifai/Features/TitleGeneration.php
+++ b/includes/Classifai/Features/TitleGeneration.php
@@ -344,6 +344,28 @@ public function get_feature_default_settings(): array {
 		];
 	}
 
+	/**
+	 * Returns the settings for the feature.
+	 *
+	 * @param string $index The index of the setting to return.
+	 * @return array|mixed
+	 */
+	public function get_settings( $index = false ) {
+		$settings = parent::get_settings( $index );
+
+		// Keep using the original prompt from the codebase to allow updates.
+		if ( $settings && ! empty( $settings['generate_title_prompt'] ) ) {
+			foreach ( $settings['generate_title_prompt'] as $key => $prompt ) {
+				if ( 1 === intval( $prompt['original'] ) ) {
+					$settings['generate_title_prompt'][ $key ]['prompt'] = $this->prompt;
+					break;
+				}
+			}
+		}
+
+		return $settings;
+	}
+
 	/**
 	 * Sanitizes the default feature settings.
 	 *
diff --git a/includes/Classifai/Plugin.php b/includes/Classifai/Plugin.php
index 78025bd6f..a62da0b18 100644
--- a/includes/Classifai/Plugin.php
+++ b/includes/Classifai/Plugin.php
@@ -226,7 +226,7 @@ public function filter_plugin_action_links( $links ): array {
 			return $links;
 		}
 
-		$setup_url = admin_url( 'tools.php?page=classifai#/classifai_setup' );
+		$setup_url = admin_url( 'tools.php?page=classifai#/language_processing?welcome_guide=1' );
 		if ( should_use_legacy_settings_panel() ) {
 			$setup_url = admin_url( 'admin.php?page=classifai_setup' );
 		}
@@ -236,7 +236,7 @@ public function filter_plugin_action_links( $links ): array {
 				'setup'    => sprintf(
 					'<a href="%s"> %s </a>',
 					esc_url( $setup_url ),
-					esc_html__( 'Set up', 'classifai' )
+					esc_html__( 'Welcome', 'classifai' )
 				),
 				'settings' => sprintf(
 					'<a href="%s"> %s </a>',
diff --git a/includes/Classifai/Providers/Watson/NLU.php b/includes/Classifai/Providers/Watson/NLU.php
index 5e13b9e2f..43d347d7f 100644
--- a/includes/Classifai/Providers/Watson/NLU.php
+++ b/includes/Classifai/Providers/Watson/NLU.php
@@ -265,9 +265,9 @@ public function get_post_classifier_preview_data() {
 	 * Filter classifier preview based on the feature settings.
 	 *
 	 * @param array|WP_Error $classified_data The classified data.
-	 * @return array
+	 * @return array|WP_Error
 	 */
-	public function filter_classify_preview_data( $classified_data ): array {
+	public function filter_classify_preview_data( $classified_data ) {
 		if ( is_wp_error( $classified_data ) ) {
 			return $classified_data;
 		}
diff --git a/package-lock.json b/package-lock.json
index 66f4f33e2..9890ff069 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,23 +9,23 @@
       "version": "3.1.1",
       "license": "GPL-2.0-or-later",
       "dependencies": {
-        "@wordpress/icons": "^10.9.0",
+        "@wordpress/icons": "^10.14.0",
         "choices.js": "^11.0.2",
         "classnames": "^2.5.1",
-        "react-router-dom": "^6.27.0",
+        "react-router-dom": "^7.0.2",
         "tippy.js": "^6.3.7"
       },
       "devDependencies": {
         "@10up/cypress-wp-utils": "^0.4.0",
-        "@wordpress/env": "^10.9.0",
-        "@wordpress/scripts": "^30.6.0",
-        "cypress": "^13.15.0",
+        "@wordpress/env": "^10.14.0",
+        "@wordpress/scripts": "^30.7.0",
+        "cypress": "^13.16.1",
         "cypress-file-upload": "^5.0.8",
         "cypress-mochawesome-reporter": "^3.8.2",
         "cypress-plugin-tab": "^1.0.5",
-        "husky": "^9.1.6",
-        "jsdoc": "^4.0.3",
-        "lint-staged": "^15.2.10",
+        "husky": "^9.1.7",
+        "jsdoc": "^4.0.4",
+        "lint-staged": "^15.2.11",
         "mochawesome-json-to-md": "^0.7.2",
         "node-wp-i18n": "^1.2.7",
         "svg-react-loader": "^0.4.6",
@@ -1806,8 +1806,9 @@
       "license": "MIT"
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.9",
-      "license": "MIT",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1959,11 +1960,10 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.5.tgz",
-      "integrity": "sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.7.tgz",
+      "integrity": "sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -1978,9 +1978,9 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.13.0",
+        "qs": "6.13.1",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -1988,6 +1988,33 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@cypress/request/node_modules/qs": {
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+      "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/@cypress/request/node_modules/tough-cookie": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
+      "integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
+      "dev": true,
+      "dependencies": {
+        "tldts": "^6.1.32"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/@cypress/xvfb": {
       "version": "1.2.4",
       "dev": true,
@@ -2237,13 +2264,15 @@
     },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "dev": true
     },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
@@ -2310,6 +2339,96 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -2846,12 +2965,318 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@paulirish/trace_engine": {
       "version": "0.0.32",
       "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.32.tgz",
       "integrity": "sha512-KxWFdRNbv13U8bhYaQvH6gLG9CVEt2jKeosyOOYILVntWEVWhovbgDrbOiZ12pJO3vjZs0Zgbd3/Zgde98woEA==",
       "dev": true
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@pkgr/core": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
@@ -2943,14 +3368,6 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz",
-      "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -3039,21 +3456,24 @@
     },
     "node_modules/@sideway/address": {
       "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
     },
     "node_modules/@sideway/formula": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
+      "dev": true
     },
     "node_modules/@sideway/pinpoint": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "dev": true
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
@@ -3454,6 +3874,11 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
+    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -4409,9 +4834,9 @@
       }
     },
     "node_modules/@wordpress/env": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-10.9.0.tgz",
-      "integrity": "sha512-XS4dJY1jot25wNKnI8+wL1M4tHRIaiLW1ggwXQSyUUWinyG9kuyQA+jzIBnNGegy2pLgbSwTmovExHQNtfU2Hw==",
+      "version": "10.14.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-10.14.0.tgz",
+      "integrity": "sha512-tDJyW6KaaEs9jz2XMTjY0RpGWdsjEfOCx5jeCMWtzkgrDY5N9iZr1BFjNzmFzY1BcXQshnFsrecsnYdyIfvsTA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
@@ -4422,7 +4847,7 @@
         "inquirer": "^7.1.0",
         "js-yaml": "^3.13.1",
         "ora": "^4.0.2",
-        "rimraf": "^3.0.2",
+        "rimraf": "^5.0.10",
         "simple-git": "^3.5.0",
         "terminal-link": "^2.0.0",
         "yargs": "^17.3.0"
@@ -4435,6 +4860,56 @@
         "npm": ">=8.19.2"
       }
     },
+    "node_modules/@wordpress/env/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wordpress/env/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wordpress/env/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@wordpress/escape-html": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-3.9.0.tgz",
@@ -4548,13 +5023,13 @@
       }
     },
     "node_modules/@wordpress/icons": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.9.0.tgz",
-      "integrity": "sha512-mAkqhlbbPiuR6yBOczunqyxQ2Pez1XB7gAZnnsP5DlTKsYnJQ12N0Ql4Oh8f1LI+UeF18VMtHes12sWK/1LQHQ==",
+      "version": "10.14.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-10.14.0.tgz",
+      "integrity": "sha512-4S1AaBeqvTpsTC23y0+4WPiSyz7j+b7vJ4vQ4nqnPeBF7ZeC8J/UXWQnEuKY38n8TiutXljgagkEqGNC9pF2Mw==",
       "dependencies": {
-        "@babel/runtime": "^7.16.0",
-        "@wordpress/element": "^6.9.0",
-        "@wordpress/primitives": "^4.9.0"
+        "@babel/runtime": "7.25.7",
+        "@wordpress/element": "*",
+        "@wordpress/primitives": "*"
       },
       "engines": {
         "node": ">=18.12.0",
@@ -4657,9 +5132,9 @@
       }
     },
     "node_modules/@wordpress/scripts": {
-      "version": "30.6.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.6.0.tgz",
-      "integrity": "sha512-2i6wqCdvCcf00/vLi7twNzHUdAAOo8Uk0lqntZiBKpVrjHyLkzjmPwT3So6W/VYso5QMzEXRXYVHVKGE4wX4rg==",
+      "version": "30.7.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.7.0.tgz",
+      "integrity": "sha512-vwrf6Xo1GXV2ug4xdYMgZ2CVpNNfArOEJyX6w9CafIRmLOm8GkVGSza0VlEoOh1BTqQPv/awq6uiOKVMbVNB5Q==",
       "dev": true,
       "dependencies": {
         "@babel/core": "7.25.7",
@@ -4683,7 +5158,7 @@
         "check-node-version": "^4.1.0",
         "clean-webpack-plugin": "^3.0.0",
         "copy-webpack-plugin": "^10.2.0",
-        "cross-spawn": "^5.1.0",
+        "cross-spawn": "^7.0.6",
         "css-loader": "^6.2.0",
         "cssnano": "^6.0.1",
         "cwd": "^0.10.0",
@@ -4693,32 +5168,32 @@
         "fast-glob": "^3.2.7",
         "filenamify": "^4.2.0",
         "jest": "^29.6.2",
-        "jest-dev-server": "^9.0.1",
+        "jest-dev-server": "^10.1.4",
         "jest-environment-jsdom": "^29.6.2",
         "jest-environment-node": "^29.6.2",
         "json2php": "^0.0.9",
         "markdownlint-cli": "^0.31.1",
         "merge-deep": "^3.0.3",
-        "mini-css-extract-plugin": "^2.5.1",
+        "mini-css-extract-plugin": "^2.9.2",
         "minimist": "^1.2.0",
         "npm-package-json-lint": "^6.4.0",
         "npm-packlist": "^3.0.0",
         "postcss": "^8.4.5",
         "postcss-loader": "^6.2.1",
         "prettier": "npm:wp-prettier@3.0.3",
-        "puppeteer-core": "^23.1.0",
+        "puppeteer-core": "^23.10.1",
         "react-refresh": "^0.14.0",
         "read-pkg-up": "^7.0.1",
         "resolve-bin": "^0.4.0",
         "rtlcss-webpack-plugin": "^4.0.7",
-        "sass": "^1.35.2",
-        "sass-loader": "^12.1.0",
+        "sass": "^1.50.1",
+        "sass-loader": "^16.0.3",
         "schema-utils": "^4.2.0",
         "source-map-loader": "^3.0.0",
         "stylelint": "^16.8.2",
         "terser-webpack-plugin": "^5.3.10",
         "url-loader": "^4.1.1",
-        "webpack": "^5.95.0",
+        "webpack": "^5.97.0",
         "webpack-bundle-analyzer": "^4.9.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
@@ -5671,7 +6146,6 @@
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
@@ -5681,7 +6155,6 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -5802,7 +6275,6 @@
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
       "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
@@ -5811,8 +6283,7 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
       "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/axe-core": {
       "version": "4.10.2",
@@ -5824,9 +6295,10 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.4",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -5835,8 +6307,9 @@
     },
     "node_modules/axios/node_modules/proxy-from-env": {
       "version": "1.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
     },
     "node_modules/axobject-query": {
       "version": "4.1.0",
@@ -6197,7 +6670,6 @@
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -6592,8 +7064,7 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/catharsis": {
       "version": "0.9.0",
@@ -7183,6 +7654,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "dev": true,
@@ -7411,29 +7890,34 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "5.1.0",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/cross-spawn/node_modules/lru-cache": {
-      "version": "4.1.5",
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/cross-spawn/node_modules/yallist": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/crypto-random-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
@@ -7736,8 +8220,9 @@
     },
     "node_modules/cwd": {
       "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
+      "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-pkg": "^0.1.2",
         "fs-exists-sync": "^0.1.0"
@@ -7747,14 +8232,13 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.0.tgz",
-      "integrity": "sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==",
+      "version": "13.16.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.1.tgz",
+      "integrity": "sha512-17FtCaz0cx7ssWYKXzGB0Vub8xHwpVPr+iPt2fHhLMDhVAPVrplD+rTQsZUsfb19LVBn5iwkEUFjQ1yVVJXsLA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
-        "@cypress/request": "^3.0.4",
+        "@cypress/request": "^3.0.6",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -7765,6 +8249,7 @@
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
+        "ci-info": "^4.0.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
         "commander": "^6.2.1",
@@ -7779,7 +8264,6 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -7794,6 +8278,7 @@
         "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.3",
+        "tree-kill": "1.2.2",
         "untildify": "^4.0.0",
         "yauzl": "^2.10.0"
       },
@@ -7870,6 +8355,21 @@
         "ally.js": "^1.4.1"
       }
     },
+    "node_modules/cypress/node_modules/ci-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
+      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cypress/node_modules/extract-zip": {
       "version": "2.0.1",
       "dev": true,
@@ -7945,7 +8445,6 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -8226,19 +8725,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/default-gateway/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/default-gateway/node_modules/execa": {
       "version": "5.1.1",
       "dev": true,
@@ -8280,39 +8766,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/default-gateway/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/default-gateway/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/default-gateway/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "dev": true,
@@ -8478,6 +8931,19 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -8650,12 +9116,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -8787,7 +9258,6 @@
       "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
       "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -9705,21 +10175,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -9784,35 +10239,12 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "license": "MIT",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "*"
       }
     },
     "node_modules/eslint/node_modules/type-fest": {
@@ -9828,22 +10260,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/espree": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@@ -9976,52 +10392,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/execa/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/executable": {
       "version": "4.1.1",
       "dev": true,
@@ -10052,8 +10422,9 @@
     },
     "node_modules/expand-tilde": {
       "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+      "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "os-homedir": "^1.0.1"
       },
@@ -10155,8 +10526,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/external-editor": {
       "version": "3.1.0",
@@ -10227,8 +10597,7 @@
       "dev": true,
       "engines": [
         "node >=0.6.0"
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -10557,8 +10926,9 @@
     },
     "node_modules/find-file-up": {
       "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
+      "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fs-exists-sync": "^0.1.0",
         "resolve-dir": "^0.1.0"
@@ -10574,8 +10944,9 @@
     },
     "node_modules/find-pkg": {
       "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
+      "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-file-up": "^0.1.2"
       },
@@ -10585,8 +10956,9 @@
     },
     "node_modules/find-process": {
       "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
+      "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "commander": "^5.1.0",
@@ -10598,8 +10970,9 @@
     },
     "node_modules/find-process/node_modules/commander": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -10697,12 +11070,39 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "*"
       }
@@ -10753,8 +11153,9 @@
     },
     "node_modules/fs-exists-sync": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+      "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10862,11 +11263,10 @@
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
-      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -11002,7 +11402,6 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -11078,8 +11477,9 @@
     },
     "node_modules/global-modules": {
       "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+      "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "global-prefix": "^0.1.4",
         "is-windows": "^0.2.0"
@@ -11090,8 +11490,9 @@
     },
     "node_modules/global-prefix": {
       "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+      "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "homedir-polyfill": "^1.0.0",
         "ini": "^1.3.4",
@@ -11104,8 +11505,9 @@
     },
     "node_modules/global-prefix/node_modules/ini": {
       "version": "1.3.8",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
     },
     "node_modules/globals": {
       "version": "11.12.0",
@@ -11337,8 +11739,9 @@
     },
     "node_modules/homedir-polyfill": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parse-passwd": "^1.0.0"
       },
@@ -11528,7 +11931,6 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
       "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^2.0.2",
@@ -11571,9 +11973,9 @@
       }
     },
     "node_modules/husky": {
-      "version": "9.1.6",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz",
-      "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==",
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
       "bin": {
         "husky": "bin.js"
@@ -11678,9 +12080,10 @@
       "dev": true
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
-      "dev": true,
-      "license": "MIT"
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -12001,17 +12404,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-ci": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ci-info": "^3.2.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
@@ -12459,8 +12851,9 @@
     },
     "node_modules/is-windows": {
       "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+      "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12498,8 +12891,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
@@ -12625,6 +13017,21 @@
         "set-function-name": "^2.0.1"
       }
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
@@ -12667,21 +13074,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-changed-files/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/jest-changed-files/node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -12729,45 +13121,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/jest-changed-files/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/jest-circus": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
@@ -12881,16 +13234,18 @@
       }
     },
     "node_modules/jest-dev-server": {
-      "version": "9.0.2",
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-10.1.4.tgz",
+      "integrity": "sha512-bGQ6sedNGtT6AFHhCVqGTXMPz7UyJi/ZrhNBgyqsP0XU9N8acCEIfqZEA22rOaZ+NdEVsaltk6tL7UT6aXfI7w==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.2",
         "cwd": "^0.10.0",
         "find-process": "^1.4.7",
         "prompts": "^2.4.2",
-        "spawnd": "^9.0.2",
+        "spawnd": "^10.1.4",
         "tree-kill": "^1.2.2",
-        "wait-on": "^7.2.0"
+        "wait-on": "^8.0.1"
       },
       "engines": {
         "node": ">=16"
@@ -13346,9 +13701,10 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.12.1",
+      "version": "17.13.3",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
+      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.3.0",
         "@hapi/topo": "^5.1.0",
@@ -13400,15 +13756,13 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/jsdoc": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz",
-      "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz",
+      "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
@@ -13581,8 +13935,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true,
-      "license": "(AFL-2.1 OR BSD-3-Clause)"
+      "dev": true
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -13643,7 +13996,6 @@
       "engines": [
         "node >=0.6.0"
       ],
-      "license": "MIT",
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -13902,11 +14254,10 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
-      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -13928,22 +14279,21 @@
       }
     },
     "node_modules/lint-staged": {
-      "version": "15.2.10",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz",
-      "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==",
+      "version": "15.2.11",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.11.tgz",
+      "integrity": "sha512-Ev6ivCTYRTGs9ychvpVw35m/bcNDuBN+mnTeObCL5h+boS5WzBEC6LHI4I9F/++sZm1m+J2LEiy0gxL/R9TBqQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~12.1.0",
-        "debug": "~4.3.6",
+        "debug": "~4.4.0",
         "execa": "~8.0.1",
-        "lilconfig": "~3.1.2",
-        "listr2": "~8.2.4",
+        "lilconfig": "~3.1.3",
+        "listr2": "~8.2.5",
         "micromatch": "~4.0.8",
         "pidtree": "~0.6.0",
         "string-argv": "~0.3.2",
-        "yaml": "~2.5.0"
+        "yaml": "~2.6.1"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -13960,7 +14310,6 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
       "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "environment": "^1.0.0"
       },
@@ -13976,7 +14325,6 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -13989,7 +14337,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -14013,7 +14360,6 @@
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
       "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^5.0.0"
       },
@@ -14029,7 +14375,6 @@
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
       "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^5.0.0",
         "string-width": "^7.0.0"
@@ -14051,25 +14396,11 @@
         "node": ">=18"
       }
     },
-    "node_modules/lint-staged/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/lint-staged/node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -14086,15 +14417,13 @@
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
       "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lint-staged/node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lint-staged/node_modules/execa": {
       "version": "8.0.1",
@@ -14142,7 +14471,6 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
       "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -14162,11 +14490,10 @@
       }
     },
     "node_modules/lint-staged/node_modules/listr2": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz",
+      "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^4.0.0",
         "colorette": "^2.0.20",
@@ -14184,7 +14511,6 @@
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
       "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^7.0.0",
         "cli-cursor": "^5.0.0",
@@ -14204,7 +14530,6 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
       "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-east-asian-width": "^1.0.0"
       },
@@ -14220,7 +14545,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
       "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "is-fullwidth-code-point": "^5.0.0"
@@ -14247,8 +14571,7 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/lint-staged/node_modules/npm-run-path": {
       "version": "5.2.0",
@@ -14294,7 +14617,6 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
       "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "onetime": "^7.0.0",
         "signal-exit": "^4.1.0"
@@ -14311,34 +14633,14 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
       "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-function": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lint-staged/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lint-staged/node_modules/signal-exit": {
@@ -14357,7 +14659,6 @@
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
       "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.0.0",
         "is-fullwidth-code-point": "^4.0.0"
@@ -14374,7 +14675,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
       "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^10.3.0",
         "get-east-asian-width": "^1.0.0",
@@ -14392,7 +14692,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -14414,26 +14713,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/lint-staged/node_modules/wrap-ansi": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
       "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.2.1",
         "string-width": "^7.0.0",
@@ -14446,19 +14730,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/lint-staged/node_modules/yaml": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/listr2": {
       "version": "3.14.0",
       "dev": true,
@@ -15103,7 +15374,6 @@
       "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
       "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -15130,9 +15400,10 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.8.0",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0",
         "tapable": "^2.2.1"
@@ -15149,14 +15420,15 @@
       }
     },
     "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.12.0",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -15165,8 +15437,9 @@
     },
     "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -15176,13 +15449,15 @@
     },
     "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -15190,7 +15465,7 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -15261,6 +15536,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/mixin-object": {
       "version": "2.0.1",
       "dev": true,
@@ -15766,6 +16050,13 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "dev": true,
@@ -16353,8 +16644,9 @@
     },
     "node_modules/os-homedir": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16505,6 +16797,12 @@
         "node": ">= 14"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "node_modules/param-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
@@ -16551,8 +16849,9 @@
     },
     "node_modules/parse-passwd": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16630,6 +16929,28 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
     "node_modules/path-to-regexp": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
@@ -16653,8 +16974,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
@@ -17619,11 +17939,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/psl": {
       "version": "1.9.0",
       "dev": true,
@@ -17996,33 +18311,41 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.27.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz",
-      "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+      "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
       "dependencies": {
-        "@remix-run/router": "1.20.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.27.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz",
-      "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz",
+      "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==",
       "dependencies": {
-        "@remix-run/router": "1.20.0",
-        "react-router": "6.27.0"
+        "react-router": "7.0.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+        "react": ">=18",
+        "react-dom": ">=18"
       }
     },
     "node_modules/read-pkg": {
@@ -18417,8 +18740,9 @@
     },
     "node_modules/resolve-dir": {
       "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+      "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "expand-tilde": "^1.2.2",
         "global-modules": "^0.2.3"
@@ -18689,12 +19013,13 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.71.1",
+      "version": "1.83.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
+      "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -18702,32 +19027,35 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
-      "version": "12.6.0",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
+      "integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "klona": "^2.0.4",
         "neo-async": "^2.6.2"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "@rspack/core": "0.x || 1.x",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
         "sass": "^1.3.0",
         "sass-embedded": "*",
         "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
-        "fibers": {
+        "@rspack/core": {
           "optional": true
         },
         "node-sass": {
@@ -18738,9 +19066,40 @@
         },
         "sass-embedded": {
           "optional": true
+        },
+        "webpack": {
+          "optional": true
         }
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dev": true,
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/sax": {
       "version": "1.3.0",
       "dev": true,
@@ -18983,6 +19342,11 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+    },
     "node_modules/set-function-length": {
       "version": "1.2.1",
       "dev": true,
@@ -19055,22 +19419,24 @@
       }
     },
     "node_modules/shebang-command": {
-      "version": "1.2.0",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/shebang-regex": {
-      "version": "1.0.0",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
@@ -19301,7 +19667,9 @@
       "license": "MIT"
     },
     "node_modules/spawnd": {
-      "version": "9.0.2",
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-10.1.4.tgz",
+      "integrity": "sha512-drqHc0mKJmtMsiGMOCwzlc5eZ0RPtRvT7tQAluW2A0qUc0G7TQ8KLcn3E6K5qzkLkH2UkS3nYQiVGULvvsD9dw==",
       "dev": true,
       "dependencies": {
         "signal-exit": "^4.1.0",
@@ -19313,8 +19681,9 @@
     },
     "node_modules/spawnd/node_modules/signal-exit": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -19436,7 +19805,6 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -19566,6 +19934,27 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
       "dev": true,
@@ -19683,6 +20072,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -20412,6 +20814,18 @@
         "@popperjs/core": "^2.9.0"
       }
     },
+    "node_modules/tldts": {
+      "version": "6.1.67",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.67.tgz",
+      "integrity": "sha512-714VbegxoZ9WF5/IsVCy9rWXKUpPkJq87ebWLXQzNawce96l5oRrRf2eHzB4pT2g/4HQU1dYbu+sdXClYxlDKQ==",
+      "dev": true,
+      "dependencies": {
+        "tldts-core": "^6.1.67"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
     "node_modules/tldts-core": {
       "version": "6.1.67",
       "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.67.tgz",
@@ -20512,8 +20926,9 @@
     },
     "node_modules/tree-kill": {
       "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -20628,7 +21043,6 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -20636,12 +21050,16 @@
         "node": "*"
       }
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
+    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true,
-      "license": "Unlicense"
+      "dev": true
     },
     "node_modules/type-check": {
       "version": "0.4.0",
@@ -21114,7 +21532,6 @@
       "engines": [
         "node >=0.6.0"
       ],
-      "license": "MIT",
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -21125,8 +21542,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
@@ -21140,12 +21556,13 @@
       }
     },
     "node_modules/wait-on": {
-      "version": "7.2.0",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.1.tgz",
+      "integrity": "sha512-1wWQOyR2LVVtaqrcIL2+OM+x7bkpmzVROa0Nf6FryXkS+er5Sa1kzFGjzZRqLnHa3n1rACFLeTwUqE1ETL9Mig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "axios": "^1.6.1",
-        "joi": "^17.11.0",
+        "axios": "^1.7.7",
+        "joi": "^17.13.3",
         "lodash": "^4.17.21",
         "minimist": "^1.2.8",
         "rxjs": "^7.8.1"
@@ -21159,8 +21576,9 @@
     },
     "node_modules/wait-on/node_modules/rxjs": {
       "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -21369,52 +21787,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/webpack-cli/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/which": {
-      "version": "2.0.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/webpack-dev-middleware": {
       "version": "5.3.4",
       "dev": true,
@@ -21857,6 +22229,24 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "dev": true,
@@ -21958,9 +22348,13 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.3.4",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+      "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
       "dev": true,
-      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
diff --git a/package.json b/package.json
index dcd0c69fd..8a995aba6 100644
--- a/package.json
+++ b/package.json
@@ -37,15 +37,15 @@
   },
   "devDependencies": {
     "@10up/cypress-wp-utils": "^0.4.0",
-    "@wordpress/env": "^10.9.0",
-    "@wordpress/scripts": "^30.6.0",
-    "cypress": "^13.15.0",
+    "@wordpress/env": "^10.14.0",
+    "@wordpress/scripts": "^30.7.0",
+    "cypress": "^13.16.1",
     "cypress-file-upload": "^5.0.8",
     "cypress-mochawesome-reporter": "^3.8.2",
     "cypress-plugin-tab": "^1.0.5",
-    "husky": "^9.1.6",
-    "jsdoc": "^4.0.3",
-    "lint-staged": "^15.2.10",
+    "husky": "^9.1.7",
+    "jsdoc": "^4.0.4",
+    "lint-staged": "^15.2.11",
     "mochawesome-json-to-md": "^0.7.2",
     "node-wp-i18n": "^1.2.7",
     "svg-react-loader": "^0.4.6",
@@ -53,10 +53,10 @@
     "wp-hookdoc": "^0.2.0"
   },
   "dependencies": {
-    "@wordpress/icons": "^10.9.0",
+    "@wordpress/icons": "^10.14.0",
     "choices.js": "^11.0.2",
     "classnames": "^2.5.1",
-    "react-router-dom": "^6.27.0",
+    "react-router-dom": "^7.0.2",
     "tippy.js": "^6.3.7"
   }
 }
diff --git a/src/js/components/user-selector.js b/src/js/components/user-selector.js
index 80be5a9b6..b5151616f 100644
--- a/src/js/components/user-selector.js
+++ b/src/js/components/user-selector.js
@@ -125,6 +125,7 @@ export const UserSelector = ( { value, onChange } ) => {
 				remove: __( 'Remove user', 'classifai' ),
 				__experimentalInvalid: __( 'Invalid user', 'classifai' ),
 			} }
+			__nextHasNoMarginBottom
 		/>
 	);
 };
diff --git a/src/js/settings/components/allowed-roles/index.js b/src/js/settings/components/allowed-roles/index.js
index 91d9ce1b0..14f86c8b0 100644
--- a/src/js/settings/components/allowed-roles/index.js
+++ b/src/js/settings/components/allowed-roles/index.js
@@ -53,6 +53,7 @@ export const AllowedRoles = () => {
 								},
 							} );
 						} }
+						__nextHasNoMarginBottom
 					/>
 				);
 			} ) }
diff --git a/src/js/settings/components/classifai-onboarding/classifai-registration.js b/src/js/settings/components/classifai-onboarding/classifai-registration.js
deleted file mode 100644
index 06baf4f45..000000000
--- a/src/js/settings/components/classifai-onboarding/classifai-registration.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * External dependencies
- */
-import { useNavigate } from 'react-router-dom';
-
-/**
- * WordPress dependencies
- */
-import { Button, Fill } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { ClassifAIRegistrationForm } from '../classifai-registration';
-import { useSetupPage } from './hooks';
-
-/**
- * ClassifAI Registration Step Component for the Onboarding Process.
- *
- * This component is responsible for rendering the registration step in the ClassifAI onboarding process.
- * It utilizes the ClassifAIRegistrationForm component to display the registration form.
- *
- * @return {React.ReactElement} ClassifAIRegistrationStep component.
- */
-export const ClassifAIRegistrationStep = () => {
-	const navigate = useNavigate();
-	const { nextStepPath } = useSetupPage();
-	return (
-		<>
-			<h1 className="classifai-setup-heading">
-				{ __( 'Register ClassifAI', 'classifai' ) }
-			</h1>
-			<div className="classifai-setup__content__row classifai-onboarding__configure ">
-				<div className="classifai-setup__content__row__column">
-					<ClassifAIRegistrationForm
-						onSaveSuccess={ () => navigate( nextStepPath ) }
-					/>
-					<Fill name="ClassifAIBeforeRegisterSaveButton">
-						<Button onClick={ () => navigate( nextStepPath ) }>
-							{ __( 'Skip for now', 'classifai' ) }
-						</Button>
-					</Fill>
-				</div>
-			</div>
-		</>
-	);
-};
diff --git a/src/js/settings/components/classifai-onboarding/configure-features.js b/src/js/settings/components/classifai-onboarding/configure-features.js
deleted file mode 100644
index cd1fa6b81..000000000
--- a/src/js/settings/components/classifai-onboarding/configure-features.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * External dependencies
- */
-import { useNavigate } from 'react-router-dom';
-
-/**
- * WordPress dependencies
- */
-import { useState } from '@wordpress/element';
-import { useSelect } from '@wordpress/data';
-import { Fill, SlotFillProvider, Button } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { FeatureSettings } from '..';
-import { FeatureContext } from '../feature-settings/context';
-import { getFeature, isFeatureActive } from '../../utils/utils';
-import { STORE_NAME } from '../../data/store';
-import { useSetupPage } from './hooks';
-
-/**
- * React Component for configuring the AI providers step in the onboarding process.
- *
- * This component uses the FeatureSettings component to render the settings for each AI provider feature.
- *
- * @return {React.ReactElement} ConfigureFeatures component.
- */
-export const ConfigureFeatures = () => {
-	const settings = useSelect( ( select ) =>
-		select( STORE_NAME ).getSettings()
-	);
-	const enabledFeatures = Object.keys( settings ).filter(
-		( feature ) => settings[ feature ].status === '1'
-	);
-	const { nextStepPath } = useSetupPage();
-	const navigate = useNavigate();
-	const [ currentFeature, setCurrentFeature ] = useState(
-		enabledFeatures[ 0 ]
-	);
-	let featureIndex = enabledFeatures.findIndex(
-		( ef ) => ef === currentFeature
-	);
-
-	const onSaveSuccess = () => {
-		if ( featureIndex + 1 !== enabledFeatures.length ) {
-			setCurrentFeature( enabledFeatures[ ++featureIndex ] );
-		} else {
-			// Navigate to the next step.
-			navigate( nextStepPath );
-		}
-	};
-
-	return (
-		<>
-			<h1 className="classifai-setup-heading">
-				{ __( 'Set up AI Providers', 'classifai' ) }
-			</h1>
-			<div className="service-settings-wrapper classifai-onboarding__configure">
-				<div className="classifai-tabs" aria-orientation="vertical">
-					{ enabledFeatures.map( ( feature, index ) => {
-						let icon = 'clock';
-						if ( isFeatureActive( settings[ feature ] ) ) {
-							icon = 'yes-alt';
-						} else if (
-							index < enabledFeatures.indexOf( currentFeature )
-						) {
-							icon = 'warning';
-						}
-
-						return (
-							<Button
-								key={ feature }
-								onClick={ () => setCurrentFeature( feature ) }
-								className={ `classifai-tabs-item ${
-									feature === currentFeature && 'active-tab'
-								}` }
-								icon={ icon }
-							>
-								{ getFeature( feature ).label }
-							</Button>
-						);
-					} ) }
-				</div>
-				<div className="feature-settings-wrapper">
-					<FeatureContext.Provider
-						value={ { featureName: currentFeature } }
-					>
-						<SlotFillProvider>
-							<FeatureSettings onSaveSuccess={ onSaveSuccess } />
-							<Fill name="ClassifAIBeforeSaveButton">
-								<Button onClick={ onSaveSuccess }>
-									{ __( 'Skip for now', 'classifai' ) }
-								</Button>
-							</Fill>
-						</SlotFillProvider>
-					</FeatureContext.Provider>
-				</div>
-			</div>
-		</>
-	);
-};
diff --git a/src/js/settings/components/classifai-onboarding/enable-features.js b/src/js/settings/components/classifai-onboarding/enable-features.js
deleted file mode 100644
index 62aca1cc7..000000000
--- a/src/js/settings/components/classifai-onboarding/enable-features.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * External dependencies
- */
-import { useNavigate } from 'react-router-dom';
-
-/**
- * WordPress dependencies
- */
-import {
-	ToggleControl,
-	Flex,
-	FlexItem,
-	BaseControl,
-	Button,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import apiFetch from '@wordpress/api-fetch';
-import { useState, useEffect } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { FeatureContext } from '../feature-settings/context';
-import { EnableToggleControl } from '../feature-settings/enable-feature';
-import { SaveSettingsButton } from '../../components/feature-settings/save-settings-button';
-import { useSetupPage } from './hooks';
-
-/**
- * React Component for the feature enabling step in the onboarding process.
- *
- * This component renders the initial step of the onboarding process, allowing users to enable or disable various features.
- * It utilizes the EnableToggleControl component to display the settings for each feature.
- *
- * @return {React.ReactElement} EnableFeatures component.
- */
-export const EnableFeatures = () => {
-	const [ registrationSettings, setRegistrationSettings ] = useState( {} );
-	const { features, services, dashboardUrl } = window.classifAISettings;
-	const { nextStepPath } = useSetupPage();
-	const navigate = useNavigate();
-
-	// Load the settings.
-	useEffect( () => {
-		( async () => {
-			let regSettings = {};
-			try {
-				regSettings = await apiFetch( {
-					path: '/classifai/v1/registration',
-				} );
-			} catch ( error ) {
-				console.error( error ); // eslint-disable-line no-console
-			}
-
-			setRegistrationSettings( regSettings );
-		} )();
-	}, [ setRegistrationSettings ] );
-
-	const onSaveSuccess = () => {
-		if ( registrationSettings?.valid_license ) {
-			navigate(
-				nextStepPath?.replace(
-					'/classifai_registration',
-					'/configure_features'
-				)
-			);
-		} else {
-			navigate( nextStepPath );
-		}
-	};
-
-	const featureToggles = Object.keys( services ).map(
-		( service, serviceIndex ) => (
-			<React.Fragment key={ service }>
-				<div className="classifai-feature-box">
-					<h4 className="classifai-feature-box-title">
-						{ services[ service ] }
-					</h4>
-					<div className="classifai-features">
-						{ Object.keys( features[ service ] ).map(
-							( featureSlug ) => (
-								<BaseControl key={ featureSlug }>
-									<FeatureContext.Provider
-										value={ { featureName: featureSlug } }
-									>
-										<EnableToggleControl>
-											{ ( {
-												feature,
-												status,
-												setFeatureSettings,
-											} ) => {
-												return (
-													<Flex>
-														<FlexItem>
-															<span className="classifai-feature-text">
-																{
-																	feature.label
-																}
-															</span>
-														</FlexItem>
-														<FlexItem>
-															<ToggleControl
-																checked={
-																	status ===
-																	'1'
-																}
-																onChange={ (
-																	value
-																) =>
-																	setFeatureSettings(
-																		{
-																			status: value
-																				? '1'
-																				: '0', // TODO: Use boolean, currently using string for compatibility.
-																		}
-																	)
-																}
-															/>
-														</FlexItem>
-													</Flex>
-												);
-											} }
-										</EnableToggleControl>
-									</FeatureContext.Provider>
-								</BaseControl>
-							)
-						) }
-					</div>
-				</div>
-				{ Object.keys( services ).length !== serviceIndex + 1 && (
-					<hr />
-				) }
-			</React.Fragment>
-		)
-	);
-
-	return (
-		<>
-			<h1 className="classifai-setup-heading">
-				{ __( 'Welcome to ClassifAI', 'classifai' ) }
-			</h1>
-			<div className="classifai-onboarding__configure classifai-onboarding__configure--enable-features classifai-setup__content__row">
-				<div className="classifai-setup__content__row__column">
-					<div className="classifai-setup-image">
-						<img
-							src={ `${ window.ClassifAI.plugin_url }assets/img/onboarding-1.png` }
-							alt={ __( 'ClassifAI Set up', 'classifai' ) }
-						/>
-					</div>
-				</div>
-				<div className="classifai-setup__content__row__column">
-					<div className="classifai-step1-content">
-						<h2 className="classifai-setup-title">
-							{ __(
-								'Set up ClassifAI to meet your needs',
-								'classifai'
-							) }
-						</h2>
-						{ featureToggles }
-						<div className="classifai-settings-footer">
-							<Button
-								onClick={ () => {
-									window.location.href = dashboardUrl;
-								} }
-							>
-								{ __( 'Skip for now', 'classifai' ) }
-							</Button>
-							<SaveSettingsButton
-								label={ __( 'Start Setup', 'classifai' ) }
-								onSaveSuccess={ onSaveSuccess }
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
-		</>
-	);
-};
diff --git a/src/js/settings/components/classifai-onboarding/finish-step.js b/src/js/settings/components/classifai-onboarding/finish-step.js
deleted file mode 100644
index 3174fc8e3..000000000
--- a/src/js/settings/components/classifai-onboarding/finish-step.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * External dependencies
- */
-import { useNavigate } from 'react-router-dom';
-
-/**
- * WordPress dependencies
- */
-import { Icon, Button } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import { STORE_NAME } from '../../data/store';
-import { isFeatureActive, getFeature } from '../../utils/utils';
-
-/**
- * React Component for the final step in the onboarding process.
- *
- * This component displays a summary of the features that have been enabled during the onboarding process.
- * It provides users with a clear overview of their selected settings before completing the onboarding.
- *
- * @return {React.ReactElement} FinishStep component.
- */
-export const FinishStep = () => {
-	const {
-		features: __settings,
-		services,
-		dashboardUrl,
-	} = window.classifAISettings;
-	const navigate = useNavigate();
-	const settingsState = useSelect( ( select ) =>
-		select( STORE_NAME ).getSettings()
-	);
-	const enabledFeatureSlugs = Object.keys( settingsState ).filter(
-		( feature ) => settingsState[ feature ].status === '1'
-	);
-	const settings = Object.keys( __settings ).reduce( ( a, c ) => {
-		const res = Object.keys( __settings[ c ] ).reduce( ( __a, __c ) => {
-			return {
-				...__a,
-				[ __c ]: settingsState[ __c ],
-			};
-		}, {} );
-
-		return {
-			...a,
-			[ c ]: res,
-		};
-	}, {} );
-
-	return (
-		<>
-			<h1 className="classifai-setup-heading">
-				{ __( 'Welcome to ClassifAI', 'classifai' ) }
-			</h1>
-			<div className="classifai-setup__content__row classifai-onboarding__configure ">
-				<div className="classifai-setup__content__row__column">
-					<div className="classifai-setup-image">
-						<img
-							src={ `${ window.ClassifAI.plugin_url }assets/img/onboarding-4.png` }
-							alt={ __( '', 'classifai' ) }
-						/>
-					</div>
-				</div>
-				<div className="classifai-setup__content__row__column">
-					<div className="classifai-step4-content">
-						<h2 className="classifai-setup-title">
-							{ __(
-								'ClassifAI configured successfully!',
-								'classifai'
-							) }
-						</h2>
-						{ Object.keys( services ).map( ( service ) => {
-							const enabledFeatures = Object.keys(
-								settings[ service ]
-							)
-								.map( ( featureSlug ) => {
-									const feature = getFeature( featureSlug );
-									const label = feature.label;
-
-									if (
-										! enabledFeatureSlugs.includes(
-											featureSlug
-										)
-									) {
-										return null;
-									}
-
-									return (
-										<li
-											key={ featureSlug }
-											className="classifai-enable-feature"
-										>
-											{ isFeatureActive(
-												settings[ service ][
-													featureSlug
-												]
-											) ? (
-												<Icon icon="yes-alt" />
-											) : (
-												<Icon icon="dismiss" />
-											) }{ ' ' }
-											{ label }
-										</li>
-									);
-								} )
-								.filter( Boolean );
-
-							if ( ! enabledFeatures.length ) {
-								return [];
-							}
-
-							return (
-								<div
-									className="classifai-feature-box"
-									key={ service }
-								>
-									<h4 className="classifai-feature-box-title">
-										{ services[ service ] }
-									</h4>
-									<div className="classifai-features">
-										<ul> { enabledFeatures } </ul>
-									</div>
-								</div>
-							);
-						} ) }
-					</div>
-					<div className="classifai-settings-footer">
-						<Button
-							onClick={ () => navigate( '/language_processing' ) }
-						>
-							{ __( 'Adjust ClassifAI settings', 'classifai' ) }
-						</Button>
-						<Button
-							variant="primary"
-							className="save-settings-button"
-							onClick={ () => {
-								window.location.href = dashboardUrl;
-							} }
-						>
-							{ __( 'Done', 'classifai' ) }
-						</Button>
-					</div>
-				</div>
-			</div>
-		</>
-	);
-};
diff --git a/src/js/settings/components/classifai-onboarding/hooks.js b/src/js/settings/components/classifai-onboarding/hooks.js
deleted file mode 100644
index e0f9a6149..000000000
--- a/src/js/settings/components/classifai-onboarding/hooks.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * External dependencies
- */
-import { useLocation } from 'react-router-dom';
-
-/**
- * Internal dependencies
- */
-import { getNextOnboardingStep } from '../../utils/utils';
-
-/**
- * Custom hook to determine if the current page is a setup page and to retrieve the current step, next step, and next step path.
- *
- * This hook provides an object containing:
- * - `isSetupPage`: A boolean indicating whether the current page is a setup page.
- * - `step`: The current step in the setup process.
- * - `nextStep`: The next step in the setup process.
- * - `nextStepPath`: The URL path for the next step.
- *
- * @return {Object} An object containing the setup page status, current step, next step, and next step path.
- */
-export const useSetupPage = () => {
-	const location = useLocation();
-	const isSetupPage =
-		location?.pathname?.startsWith( '/classifai_setup' ) || false;
-	const step = isSetupPage ? location?.pathname?.split( '/' )[ 2 ] || '' : '';
-	const nextStep = step ? getNextOnboardingStep( step ) : '';
-	const nextStepPath = nextStep ? `/classifai_setup/${ nextStep }` : '';
-
-	return {
-		isSetupPage,
-		step,
-		nextStep,
-		nextStepPath,
-	};
-};
diff --git a/src/js/settings/components/classifai-onboarding/index.js b/src/js/settings/components/classifai-onboarding/index.js
deleted file mode 100644
index b685d91a0..000000000
--- a/src/js/settings/components/classifai-onboarding/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * External dependencies
- */
-import { Outlet } from 'react-router-dom';
-
-// Export the steps of the onboarding process.
-export { EnableFeatures } from './enable-features';
-export { ConfigureFeatures } from './configure-features';
-export { FinishStep } from './finish-step';
-export { ClassifAIRegistrationStep } from './classifai-registration';
-
-/**
- * ClassifAI Onboarding Component.
- *
- * This component handles the rendering of the entire onboarding process for ClassifAI.
- * It guides users through the necessary steps to configure and enable various features.
- *
- * @return {React.ReactElement} ClassifAIOnboarding component.
- */
-export const ClassifAIOnboarding = () => {
-	return (
-		<div className="classifai-setup__content">
-			<Outlet />
-		</div>
-	);
-};
diff --git a/src/js/settings/components/classifai-registration/index.js b/src/js/settings/components/classifai-registration/index.js
index 0cb88c74b..e51f00b5e 100644
--- a/src/js/settings/components/classifai-registration/index.js
+++ b/src/js/settings/components/classifai-registration/index.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { NavLink } from 'react-router-dom';
-
 /**
  * WordPress dependencies
  */
@@ -13,6 +8,8 @@ import {
 	Button,
 	Slot,
 	Notice,
+	Flex,
+	FlexItem,
 	__experimentalInputControl as InputControl, // eslint-disable-line @wordpress/no-unsafe-wp-apis
 } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -226,16 +223,19 @@ export const SaveSettingsButton = ( {
 	};
 
 	return (
-		<Button
-			className="save-settings-button"
-			variant="primary"
-			onClick={ saveSettings }
-			isBusy={ isSaving }
-		>
-			{ isSaving
-				? __( 'Saving…', 'classifai' )
-				: __( 'Save Settings', 'classifai' ) }
-		</Button>
+		<Flex justify="end" expanded={ false }>
+			<FlexItem>
+				<Button
+					variant="primary"
+					onClick={ saveSettings }
+					isBusy={ isSaving }
+				>
+					{ isSaving
+						? __( 'Saving…', 'classifai' )
+						: __( 'Save Settings', 'classifai' ) }
+				</Button>
+			</FlexItem>
+		</Flex>
 	);
 };
 
@@ -248,15 +248,8 @@ export const SaveSettingsButton = ( {
  */
 export const ClassifAIRegistration = () => {
 	return (
-		<div className="service-settings-wrapper">
-			<div className="classifai-tabs" aria-orientation="vertical">
-				<NavLink className={ 'active-tab classifai-tabs-item' }>
-					{ __( 'ClassifAI Registration', 'classifai' ) }
-				</NavLink>
-			</div>
-			<div className="feature-settings-wrapper">
-				<ClassifAIRegistrationForm />
-			</div>
+		<div className="classifai-settings-dashboard">
+			<ClassifAIRegistrationForm />
 		</div>
 	);
 };
diff --git a/src/js/settings/components/classifai-settings/index.js b/src/js/settings/components/classifai-settings/index.js
index 8cb0f1df7..bbbffe56c 100644
--- a/src/js/settings/components/classifai-settings/index.js
+++ b/src/js/settings/components/classifai-settings/index.js
@@ -8,6 +8,7 @@ import {
 	HashRouter,
 	useParams,
 	NavLink,
+	useLocation,
 } from 'react-router-dom';
 
 /**
@@ -16,43 +17,20 @@ import {
 import { useDispatch } from '@wordpress/data';
 import { SlotFillProvider } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
-import { useEffect } from '@wordpress/element';
+import { useEffect, useState } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 
 /**
  * Internal dependencies
  */
-import {
-	ClassifAIOnboarding,
-	FeatureSettings,
-	Header,
-	ServiceSettings,
-} from '..';
+import { FeatureSettings, Header, ServiceSettings } from '..';
 import { STORE_NAME } from '../../data/store';
 import { FeatureContext } from '../feature-settings/context';
 import { ClassifAIRegistration } from '../classifai-registration';
-import {
-	ConfigureFeatures,
-	EnableFeatures,
-	FinishStep,
-	ClassifAIRegistrationStep,
-} from '../classifai-onboarding';
-import { useSetupPage } from '../classifai-onboarding/hooks';
+import { ClassifAIWelcomeGuide } from './welcome-guide';
 
 const { services, features } = window.classifAISettings;
 
-/**
- * DefaultFeatureSettings component to navigate to the default feature settings.
- * If no feature is selected, it will redirect to the first feature.
- *
- * @return {React.ReactElement} The DefaultFeatureSettings component.
- */
-const DefaultFeatureSettings = () => {
-	const { service } = useParams();
-	const feature = Object.keys( features[ service ] || {} )[ 0 ];
-	return <Navigate to={ feature } replace />;
-};
-
 /**
  * FeatureSettingsWrapper component to render the feature settings.
  * If the feature is not available from URL parameters, it will redirect to the first feature of selected service.
@@ -99,39 +77,47 @@ const ServiceSettingsWrapper = () => {
  * @return {React.ReactElement} The ServiceNavigation component.
  */
 export const ServiceNavigation = () => {
-	const { isSetupPage } = useSetupPage();
-	if ( isSetupPage ) {
-		return null;
-	}
+	const location = useLocation();
+	const queryParams = new URLSearchParams( location.search );
+	const [ showWelcomeGuide, setShowWelcomeGuide ] = useState(
+		() => '1' === queryParams.get( 'welcome_guide' )
+	);
 
 	const serviceKeys = Object.keys( services || {} );
 	return (
-		<div className="classifai-tabs" aria-orientation="horizontal">
-			{ serviceKeys.map( ( service ) => (
+		<>
+			{ !! showWelcomeGuide && (
+				<ClassifAIWelcomeGuide
+					closeWelcomeGuide={ () => setShowWelcomeGuide( false ) }
+				/>
+			) }
+			<div className="classifai-tabs" aria-orientation="horizontal">
+				{ serviceKeys.map( ( service ) => (
+					<NavLink
+						to={ service }
+						key={ service }
+						className={ ( { isActive } ) =>
+							isActive
+								? 'active-tab classifai-tabs-item'
+								: 'classifai-tabs-item'
+						}
+					>
+						{ services[ service ] }
+					</NavLink>
+				) ) }
 				<NavLink
-					to={ service }
-					key={ service }
+					to="classifai_registration"
+					key="classifai_registration"
 					className={ ( { isActive } ) =>
 						isActive
 							? 'active-tab classifai-tabs-item'
 							: 'classifai-tabs-item'
 					}
 				>
-					{ services[ service ] }
+					{ __( 'ClassifAI Registration', 'classifai' ) }
 				</NavLink>
-			) ) }
-			<NavLink
-				to="classifai_registration"
-				key="classifai_registration"
-				className={ ( { isActive } ) =>
-					isActive
-						? 'active-tab classifai-tabs-item'
-						: 'classifai-tabs-item'
-				}
-			>
-				{ __( 'ClassifAI Registration', 'classifai' ) }
-			</NavLink>
-		</div>
+			</div>
+		</>
 	);
 };
 
@@ -174,6 +160,14 @@ export const ClassifAISettings = () => {
 
 	// Render admin notices after the header.
 	useEffect( () => {
+		const isWelcomePage =
+			document.location?.hash?.includes( 'classifai_setup' );
+
+		// Ignore showing notices on the welcome page.
+		if ( isWelcomePage ) {
+			return;
+		}
+
 		const notices = document.querySelectorAll(
 			'div.updated, div.error, div.notice'
 		);
@@ -199,46 +193,11 @@ export const ClassifAISettings = () => {
 						<Route
 							path=":service"
 							element={ <ServiceSettingsWrapper /> }
-						>
-							<Route
-								index
-								element={ <DefaultFeatureSettings /> }
-							/>
-							<Route
-								path=":feature"
-								element={ <FeatureSettingsWrapper /> }
-							/>
-						</Route>
+						/>
 						<Route
-							path="classifai_setup"
-							element={ <ClassifAIOnboarding /> }
-						>
-							<Route
-								index
-								element={
-									<Navigate to="enable_features" replace />
-								}
-							/>
-							<Route
-								path="enable_features"
-								element={ <EnableFeatures /> }
-							/>
-							<Route
-								path="classifai_registration"
-								element={ <ClassifAIRegistrationStep /> }
-							/>
-							<Route
-								path="configure_features"
-								element={ <ConfigureFeatures /> }
-							/>
-							<Route path="finish" element={ <FinishStep /> } />
-							<Route
-								path="*"
-								element={
-									<Navigate to="enable_features" replace />
-								}
-							/>
-						</Route>
+							path=":service/:feature"
+							element={ <FeatureSettingsWrapper /> }
+						/>
 						<Route
 							path="classifai_registration"
 							element={ <ClassifAIRegistration /> }
diff --git a/src/js/settings/components/classifai-settings/welcome-guide.js b/src/js/settings/components/classifai-settings/welcome-guide.js
new file mode 100644
index 000000000..165ae6fdf
--- /dev/null
+++ b/src/js/settings/components/classifai-settings/welcome-guide.js
@@ -0,0 +1,116 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Icon, Button, Flex, FlexItem } from '@wordpress/components';
+import { close } from '@wordpress/icons';
+
+/**
+ * ClassifAI Welcome Guide Component.
+ *
+ * This component handles the rendering of the Welcome Guide for ClassifAI.
+ * It guides users through the necessary steps to configure and enable various features.
+ *
+ * @param {Object}   props                   Component props.
+ * @param {Function} props.closeWelcomeGuide Function to close the welcome guide.
+ *
+ * @return {React.ReactElement} ClassifAIWelcomeGuide component.
+ */
+export const ClassifAIWelcomeGuide = ( { closeWelcomeGuide } ) => {
+	return (
+		<div className="classifai-setup__content classifai-welcome-guide">
+			<Flex justifyContent="space-between" align="flex-start">
+				<FlexItem>
+					<h1>{ __( 'Welcome to ClassifAI', 'classifai' ) }</h1>
+				</FlexItem>
+				<FlexItem>
+					<Button
+						icon={ <Icon icon={ close } /> }
+						onClick={ () => closeWelcomeGuide() }
+						className="classifai-welcome-guide-close"
+						label={ __( 'Close welcome guide', 'classifai' ) }
+						showTooltip={ true }
+					/>
+				</FlexItem>
+			</Flex>
+			<div className="classifai-onboarding__welcome-note">
+				<p>
+					{ __(
+						'ClassifAI helps thousands of people across the world speed up their publishing workflows, using the power of AI.',
+						'classifai'
+					) }
+				</p>
+				<p>
+					{ __(
+						"To get started, you'll need to follow a few simple steps:",
+						'classifai'
+					) }
+				</p>
+				<ol>
+					<li>
+						<strong>
+							{ __(
+								'Turn on the Feature you want to use. ',
+								'classifai'
+							) }
+						</strong>
+					</li>
+					<li>
+						<strong>
+							{ __(
+								'Choose which AI Provider you want to use for that Feature. Ensure you have an account setup with that Provider.',
+								'classifai'
+							) }
+						</strong>
+					</li>
+					<li>
+						<strong>
+							{ __(
+								'Connect that AI provider to the Feature you enabled. ',
+								'classifai'
+							) }
+						</strong>
+						<a
+							href="https://github.com/10up/classifai?tab=readme-ov-file#set-up-classification-via-ibm-watson"
+							target="_blank"
+							rel="noopener noreferrer"
+						>
+							{ __(
+								'More details on configuring settings',
+								'classifai'
+							) }
+						</a>
+					</li>
+					<li>
+						<strong>
+							{ __(
+								'Repeat for all additional Features you want to use',
+								'classifai'
+							) }
+						</strong>
+					</li>
+				</ol>
+
+				<p>
+					{ __(
+						'Once done, you can start using ClassifAI and see for yourself how much time you save.',
+						'classifai'
+					) }
+				</p>
+				<p>
+					{ __(
+						'If you need any help along the way, ',
+						'classifai'
+					) }
+					<a
+						href="https://github.com/10up/classifai#frequently-asked-questions"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						{ __( 'browse our help topics.', 'classifai' ) }
+					</a>
+				</p>
+			</div>
+		</div>
+	);
+};
diff --git a/src/js/settings/components/feature-additional-settings/classification-previewers/openai-embedding.js b/src/js/settings/components/feature-additional-settings/classification-previewers/openai-embedding.js
index cb8ca35fb..60905a0ec 100644
--- a/src/js/settings/components/feature-additional-settings/classification-previewers/openai-embedding.js
+++ b/src/js/settings/components/feature-additional-settings/classification-previewers/openai-embedding.js
@@ -86,7 +86,7 @@ export function AzureOpenAIEmbeddingsResults( { postId } ) {
 	}, [ postId ] );
 
 	const card = Object.keys( responseData ).map( ( taxSlug ) => {
-		const tags = responseData[ taxSlug ].data.map( ( tag, _index ) => {
+		const tags = responseData[ taxSlug ]?.data.map( ( tag, _index ) => {
 			const threshold = settings[ `${ taxSlug }_threshold` ];
 			const score = normalizeScore( tag.score );
 
diff --git a/src/js/settings/components/feature-additional-settings/classification.js b/src/js/settings/components/feature-additional-settings/classification.js
index b8b277f0f..fb66bb9b6 100644
--- a/src/js/settings/components/feature-additional-settings/classification.js
+++ b/src/js/settings/components/feature-additional-settings/classification.js
@@ -45,35 +45,44 @@ const ClassificationMethodSettings = () => {
 	);
 	const { setFeatureSettings } = useDispatch( STORE_NAME );
 
-	const classifaicationMethodOptions = [
-		{
+	const classificationMethodOptions = [];
+	if ( featureSettings.provider === 'ibm_watson_nlu' ) {
+		classificationMethodOptions.push( {
 			label: __(
 				'Recommend terms even if they do not exist on the site',
 				'classifai'
 			),
 			value: 'recommended_terms',
-		},
-		{
-			label: __(
-				'Only recommend terms that already exist on the site',
-				'classifai'
-			),
-			value: 'existing_terms',
-		},
-	];
+		} );
+	}
 
-	if (
-		[ 'openai_embeddings', 'azure_openai_embeddings' ].includes(
-			featureSettings.provider
-		)
-	) {
-		delete classifaicationMethodOptions[ 0 ];
-		if ( featureSettings.classification_method === 'recommended_terms' ) {
-			setFeatureSettings( {
-				classification_method: 'existing_terms',
-			} );
+	classificationMethodOptions.push( {
+		label: __(
+			'Only recommend terms that already exist on the site',
+			'classifai'
+		),
+		value: 'existing_terms',
+	} );
+
+	useEffect( () => {
+		if (
+			[ 'openai_embeddings', 'azure_openai_embeddings' ].includes(
+				featureSettings.provider
+			)
+		) {
+			if (
+				featureSettings.classification_method === 'recommended_terms'
+			) {
+				setFeatureSettings( {
+					classification_method: 'existing_terms',
+				} );
+			}
 		}
-	}
+	}, [
+		featureSettings.provider,
+		featureSettings.classification_method,
+		setFeatureSettings,
+	] );
 
 	return (
 		<SettingsRow label={ __( 'Classification method', 'classifai' ) }>
@@ -84,7 +93,7 @@ const ClassificationMethodSettings = () => {
 						classification_method: value,
 					} );
 				} }
-				options={ classifaicationMethodOptions }
+				options={ classificationMethodOptions }
 				selected={ featureSettings.classification_method }
 			/>
 		</SettingsRow>
@@ -201,6 +210,7 @@ export const ClassificationSettings = () => {
 								'Used to preview the results for a particular post.',
 								'classifai'
 							) }
+							__nextHasNoMarginBottom
 						>
 							<PostSelector showLabel={ false } />
 						</BaseControl>
@@ -259,6 +269,7 @@ export const ClassificationSettings = () => {
 									},
 								} );
 							} }
+							__nextHasNoMarginBottom
 						/>
 					);
 				} ) }
@@ -288,6 +299,7 @@ export const ClassificationSettings = () => {
 									},
 								} );
 							} }
+							__nextHasNoMarginBottom
 						/>
 					);
 				} ) }
diff --git a/src/js/settings/components/feature-additional-settings/descriptive-text-generator.js b/src/js/settings/components/feature-additional-settings/descriptive-text-generator.js
index 5b3cf89a9..a00599855 100644
--- a/src/js/settings/components/feature-additional-settings/descriptive-text-generator.js
+++ b/src/js/settings/components/feature-additional-settings/descriptive-text-generator.js
@@ -58,6 +58,7 @@ export const DescriptiveTextGeneratorSettings = () => {
 								},
 							} );
 						} }
+						__nextHasNoMarginBottom
 					/>
 				);
 			} ) }
diff --git a/src/js/settings/components/feature-additional-settings/excerpt-generation.js b/src/js/settings/components/feature-additional-settings/excerpt-generation.js
index 26ae9254f..a2d64b9cb 100644
--- a/src/js/settings/components/feature-additional-settings/excerpt-generation.js
+++ b/src/js/settings/components/feature-additional-settings/excerpt-generation.js
@@ -73,6 +73,7 @@ export const ExcerptGenerationSettings = () => {
 									},
 								} );
 							} }
+							__nextHasNoMarginBottom
 						/>
 					);
 				} ) }
diff --git a/src/js/settings/components/feature-additional-settings/image-tag-generator.js b/src/js/settings/components/feature-additional-settings/image-tag-generator.js
index 64a18f8ea..fc68f215b 100644
--- a/src/js/settings/components/feature-additional-settings/image-tag-generator.js
+++ b/src/js/settings/components/feature-additional-settings/image-tag-generator.js
@@ -46,6 +46,7 @@ export const ImageTagGeneratorSettings = () => {
 				} }
 				value={ featureSettings.tag_taxonomy || 'classifai-image-tags' }
 				options={ options }
+				__nextHasNoMarginBottom
 			/>
 		</SettingsRow>
 	);
diff --git a/src/js/settings/components/feature-additional-settings/moderation.js b/src/js/settings/components/feature-additional-settings/moderation.js
index 48784e9ca..bf0d7c2c1 100644
--- a/src/js/settings/components/feature-additional-settings/moderation.js
+++ b/src/js/settings/components/feature-additional-settings/moderation.js
@@ -55,6 +55,7 @@ export const ModerationSettings = () => {
 								},
 							} );
 						} }
+						__nextHasNoMarginBottom
 					/>
 				);
 			} ) }
diff --git a/src/js/settings/components/feature-additional-settings/nlu-feature.js b/src/js/settings/components/feature-additional-settings/nlu-feature.js
index 2f88cf41b..e66abf75e 100644
--- a/src/js/settings/components/feature-additional-settings/nlu-feature.js
+++ b/src/js/settings/components/feature-additional-settings/nlu-feature.js
@@ -105,12 +105,13 @@ export const NLUFeatureSettings = () => {
 							id={ `${ feature }-enabled` }
 							label={ __( 'Enable', 'classifai' ) }
 							value={ feature }
-							checked={ featureSettings[ feature ] }
+							checked={ !! featureSettings[ feature ] }
 							onChange={ ( value ) => {
 								setFeatureSettings( {
 									[ feature ]: value ? 1 : 0,
 								} );
 							} }
+							__nextHasNoMarginBottom
 						/>
 						<InputControl
 							id={ `${ feature }-threshold` }
@@ -150,6 +151,7 @@ export const NLUFeatureSettings = () => {
 										[ `${ feature }_taxonomy` ]: value,
 									} );
 								} }
+								__nextHasNoMarginBottom
 							/>
 						) }
 					</SettingsRow>
diff --git a/src/js/settings/components/feature-additional-settings/prompt-repeater.js b/src/js/settings/components/feature-additional-settings/prompt-repeater.js
index 0358ca5fa..3d54e3ff9 100644
--- a/src/js/settings/components/feature-additional-settings/prompt-repeater.js
+++ b/src/js/settings/components/feature-additional-settings/prompt-repeater.js
@@ -121,6 +121,7 @@ export const PromptRepeater = ( props ) => {
 									} );
 								} }
 								className="classifai-prompt-text"
+								__nextHasNoMarginBottom
 							/>
 						</>
 					) }
diff --git a/src/js/settings/components/feature-additional-settings/smart-404.js b/src/js/settings/components/feature-additional-settings/smart-404.js
index 2d1582603..d4502bef8 100644
--- a/src/js/settings/components/feature-additional-settings/smart-404.js
+++ b/src/js/settings/components/feature-additional-settings/smart-404.js
@@ -102,6 +102,7 @@ export const Smart404Settings = () => {
 							rescore: value ? '1' : '0',
 						} );
 					} }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -119,6 +120,7 @@ export const Smart404Settings = () => {
 							fallback: value ? '1' : '0',
 						} );
 					} }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -151,6 +153,7 @@ export const Smart404Settings = () => {
 							value: 'l2_norm',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 		</>
diff --git a/src/js/settings/components/feature-additional-settings/term-cleanup.js b/src/js/settings/components/feature-additional-settings/term-cleanup.js
index 122473c5d..9f93e3052 100644
--- a/src/js/settings/components/feature-additional-settings/term-cleanup.js
+++ b/src/js/settings/components/feature-additional-settings/term-cleanup.js
@@ -92,6 +92,7 @@ export const TermCleanupSettings = () => {
 							use_ep: value ? '1' : '0',
 						} );
 					} }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<>
@@ -108,7 +109,7 @@ export const TermCleanupSettings = () => {
 								label={ __( 'Enable', 'classifai' ) }
 								value={ feature }
 								checked={
-									featureSettings?.taxonomies?.[ feature ]
+									!! featureSettings?.taxonomies?.[ feature ]
 								}
 								onChange={ ( value ) => {
 									setFeatureSettings( {
@@ -118,6 +119,7 @@ export const TermCleanupSettings = () => {
 										},
 									} );
 								} }
+								__nextHasNoMarginBottom
 							/>
 							<InputControl
 								id={ `${ feature }-threshold` }
diff --git a/src/js/settings/components/feature-additional-settings/text-to-speech.js b/src/js/settings/components/feature-additional-settings/text-to-speech.js
index 5c4d3b1c5..dbd6e7d0a 100644
--- a/src/js/settings/components/feature-additional-settings/text-to-speech.js
+++ b/src/js/settings/components/feature-additional-settings/text-to-speech.js
@@ -50,6 +50,7 @@ export const TextToSpeechSettings = () => {
 								},
 							} );
 						} }
+						__nextHasNoMarginBottom
 					/>
 				);
 			} ) }
diff --git a/src/js/settings/components/feature-settings/enable-feature.js b/src/js/settings/components/feature-settings/enable-feature.js
index c17b3fdea..86f078b35 100644
--- a/src/js/settings/components/feature-settings/enable-feature.js
+++ b/src/js/settings/components/feature-settings/enable-feature.js
@@ -45,6 +45,7 @@ export const EnableToggleControl = ( { children } ) => {
 						status: value ? '1' : '0', // TODO: Use boolean, currently using string for backward compatibility.
 					} )
 				}
+				__nextHasNoMarginBottom
 			/>
 		</SettingsRow>
 	);
diff --git a/src/js/settings/components/feature-settings/index.js b/src/js/settings/components/feature-settings/index.js
index cc2d031cd..167a34129 100644
--- a/src/js/settings/components/feature-settings/index.js
+++ b/src/js/settings/components/feature-settings/index.js
@@ -1,10 +1,25 @@
+/**
+ * External dependencies
+ */
+import { useNavigate } from 'react-router-dom';
+
 /**
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
-import { Panel, PanelBody, Spinner, Notice, Slot } from '@wordpress/components';
+import {
+	Panel,
+	PanelBody,
+	Spinner,
+	Notice,
+	Slot,
+	PanelHeader,
+	Icon,
+	Button,
+} from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useEffect } from '@wordpress/element';
+import { close } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -50,6 +65,7 @@ const ElasticPressRequiredNotice = () => (
 export const FeatureSettings = ( { onSaveSuccess = () => {} } ) => {
 	const { featureName } = useFeatureContext();
 	const { setCurrentFeature } = useDispatch( STORE_NAME );
+	const navigate = useNavigate();
 
 	useEffect( () => {
 		setCurrentFeature( featureName );
@@ -100,13 +116,22 @@ export const FeatureSettings = ( { onSaveSuccess = () => {} } ) => {
 			<Slot name="ClassifAIBeforeFeatureSettingsPanel">
 				{ ( fills ) => <>{ fills }</> }
 			</Slot>
-			<Panel
-				header={
-					// translators: %s: Feature title
-					sprintf( __( '%s Settings', 'classifai' ), featureTitle )
-				}
-				className="settings-panel"
-			>
+			<Panel className="settings-panel">
+				<PanelHeader
+					label={ sprintf(
+						// translators: %s: Feature title
+						__( '%s Settings', 'classifai' ),
+						featureTitle
+					) }
+				>
+					<Button
+						icon={ <Icon icon={ close } /> }
+						onClick={ () => navigate( -1 ) }
+						className="classifai-panel-header-close"
+						label={ __( 'Back to dashboard', 'classifai' ) }
+						showTooltip={ true }
+					/>
+				</PanelHeader>
 				<PanelBody>
 					<EnableToggleControl />
 					<ProviderSettings />
diff --git a/src/js/settings/components/feature-settings/save-settings-button.js b/src/js/settings/components/feature-settings/save-settings-button.js
index 8cb36698d..185c68201 100644
--- a/src/js/settings/components/feature-settings/save-settings-button.js
+++ b/src/js/settings/components/feature-settings/save-settings-button.js
@@ -1,8 +1,13 @@
+/**
+ * External dependencies
+ */
+import { useNavigate } from 'react-router-dom';
+
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Button, Slot } from '@wordpress/components';
+import { Button, Slot, Flex, FlexItem, Icon } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 import apiFetch from '@wordpress/api-fetch';
@@ -12,7 +17,6 @@ import apiFetch from '@wordpress/api-fetch';
  */
 import { STORE_NAME } from '../../data/store';
 import { useFeatureSettings } from '../../data/hooks';
-import { useSetupPage } from '../classifai-onboarding/hooks';
 
 /**
  * Save Settings Button component.
@@ -29,7 +33,6 @@ export const SaveSettingsButton = ( {
 	label = __( 'Save Settings', 'classifai' ),
 } ) => {
 	const { featureName } = useFeatureSettings();
-	const { isSetupPage, step } = useSetupPage();
 	const { createErrorNotice, removeNotices, removeNotice } =
 		useDispatch( noticesStore );
 	const notices = useSelect( ( select ) =>
@@ -42,6 +45,7 @@ export const SaveSettingsButton = ( {
 	const settings = useSelect( ( select ) =>
 		select( STORE_NAME ).getSettings()
 	);
+	const navigate = useNavigate();
 
 	/**
 	 * Save settings for a feature.
@@ -61,11 +65,6 @@ export const SaveSettingsButton = ( {
 				: settings,
 		};
 
-		if ( isSetupPage ) {
-			data.is_setup = true;
-			data.step = step;
-		}
-
 		apiFetch( {
 			path: '/classifai/v1/settings/',
 			method: 'POST',
@@ -102,14 +101,30 @@ export const SaveSettingsButton = ( {
 	};
 
 	return (
-		<Button
-			className="save-settings-button"
-			variant="primary"
-			onClick={ saveSettings }
-			isBusy={ isSaving }
-		>
-			{ isSaving ? __( 'Saving…', 'classifai' ) : label }
-		</Button>
+		<Flex justify="end" expanded={ false }>
+			<FlexItem>
+				<Button
+					icon={ <Icon icon="arrow-left-alt2" /> }
+					iconSize={ 16 }
+					onClick={ () => navigate( -1 ) }
+					className="classifai-back-button"
+					variant="secondary"
+				>
+					{ __( 'Back to dashboard', 'classifai' ) }
+				</Button>
+			</FlexItem>
+
+			<FlexItem>
+				<Button
+					variant="primary"
+					onClick={ saveSettings }
+					isBusy={ isSaving }
+					className="save-settings-button"
+				>
+					{ isSaving ? __( 'Saving…', 'classifai' ) : label }
+				</Button>
+			</FlexItem>
+		</Flex>
 	);
 };
 
diff --git a/src/js/settings/components/header/index.js b/src/js/settings/components/header/index.js
index eeb3f1229..ca66af1c8 100644
--- a/src/js/settings/components/header/index.js
+++ b/src/js/settings/components/header/index.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { NavLink } from 'react-router-dom';
-
 /**
  * WordPress dependencies
  */
@@ -11,16 +6,14 @@ import {
 	MenuGroup,
 	MenuItem,
 	VisuallyHidden,
-	Icon,
 } from '@wordpress/components';
-import { external, help, cog, tool } from '@wordpress/icons';
+import { external, help } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { ClassifAILogo } from '../../utils/icons';
-import { useSetupPage } from '../classifai-onboarding/hooks';
 
 /**
  * Header component for the ClassifAI settings.
@@ -30,26 +23,6 @@ import { useSetupPage } from '../classifai-onboarding/hooks';
  * @return {React.ReactElement} Header component.
  */
 export const Header = () => {
-	const { isSetupPage, step } = useSetupPage();
-	const onBoardingSteps = {
-		enable_features: {
-			step: __( '1', 'classifai' ),
-			title: __( 'Enable Features', 'classifai' ),
-		},
-		classifai_registration: {
-			step: __( '2', 'classifai' ),
-			title: __( 'Register ClassifAI', 'classifai' ),
-		},
-		configure_features: {
-			step: __( '3', 'classifai' ),
-			title: __( 'Access AI', 'classifai' ),
-		},
-		finish: {
-			step: __( '4', 'classifai' ),
-			title: __( 'Finish', 'classifai' ),
-		},
-	};
-
 	return (
 		<header id="classifai-header">
 			<div className="classifai-header-layout">
@@ -57,26 +30,6 @@ export const Header = () => {
 					<div id="classifai-logo">{ ClassifAILogo }</div>
 				</div>
 				<div id="classifai-header-controls">
-					{ isSetupPage && (
-						<NavLink
-							to="language_processing"
-							key="classifai_settings"
-							className="components-button has-text has-icon"
-						>
-							<Icon icon={ cog } />
-							{ __( 'Settings', 'classifai' ) }
-						</NavLink>
-					) }
-					{ ! isSetupPage && (
-						<NavLink
-							to="classifai_setup"
-							key="classifai_setup"
-							className="components-button has-text has-icon"
-						>
-							<Icon icon={ tool } />
-							{ __( 'Set up', 'classifai' ) }
-						</NavLink>
-					) }
 					<DropdownMenu
 						popoverProps={ { placement: 'bottom-end' } }
 						toggleProps={ { size: 'compact' } }
@@ -134,89 +87,6 @@ export const Header = () => {
 					</DropdownMenu>
 				</div>
 			</div>
-			{ isSetupPage && (
-				<div className="classifai-setup__header">
-					<div className="classifai-setup__step-wrapper">
-						<div className="classifai-setup__steps">
-							{ Object.keys( onBoardingSteps ).map(
-								( stepKey, stepIndex ) => {
-									if ( stepKey === 'finish' ) {
-										return null;
-									}
-
-									const isCompleted =
-										stepIndex <
-										Object.keys( onBoardingSteps ).indexOf(
-											step
-										);
-									const isCurrent = step === stepKey;
-									const shouldShowLink =
-										isCompleted || isCurrent;
-									const classes = [];
-									if ( isCompleted ) {
-										classes.push( 'is-complete' );
-									}
-									if ( isCurrent ) {
-										classes.push( 'is-active' );
-									}
-
-									const stepLabel = (
-										<>
-											<span className="step-count">
-												{ isCompleted ? (
-													<Icon icon="yes" />
-												) : (
-													<>
-														{
-															onBoardingSteps[
-																stepKey
-															].step
-														}
-													</>
-												) }
-											</span>
-											<span className="step-title">
-												{
-													onBoardingSteps[ stepKey ]
-														.title
-												}
-											</span>
-										</>
-									);
-
-									return (
-										<React.Fragment key={ stepIndex }>
-											<div
-												className={ `classifai-setup__step ${ classes.join(
-													' '
-												) }` }
-											>
-												<div className="classifai-setup__step__label">
-													{ shouldShowLink ? (
-														<NavLink
-															to={ `/classifai_setup/${ stepKey }` }
-															key={ stepKey }
-														>
-															{ stepLabel }
-														</NavLink>
-													) : (
-														<>{ stepLabel }</>
-													) }
-												</div>
-											</div>
-											{ Object.keys( onBoardingSteps )
-												.length !==
-												stepIndex + 2 && (
-												<div className="classifai-setup__step-divider"></div>
-											) }
-										</React.Fragment>
-									);
-								}
-							) }
-						</div>
-					</div>
-				</div>
-			) }
 		</header>
 	);
 };
diff --git a/src/js/settings/components/index.js b/src/js/settings/components/index.js
index a6aa466e8..49bf8d7b3 100644
--- a/src/js/settings/components/index.js
+++ b/src/js/settings/components/index.js
@@ -1,5 +1,4 @@
 export * from './header';
-export * from './classifai-onboarding';
 export * from './classifai-settings';
 export * from './service-settings';
 export * from './feature-settings';
diff --git a/src/js/settings/components/provider-settings/amazon-polly.js b/src/js/settings/components/provider-settings/amazon-polly.js
index b10e24a86..4307a7e05 100644
--- a/src/js/settings/components/provider-settings/amazon-polly.js
+++ b/src/js/settings/components/provider-settings/amazon-polly.js
@@ -140,6 +140,7 @@ export const AmazonPollySettings = ( { isConfigured = false } ) => {
 							value: 'long-form',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow label={ __( 'Voice', 'classifai' ) }>
@@ -159,6 +160,7 @@ export const AmazonPollySettings = ( { isConfigured = false } ) => {
 								label: `${ voice?.LanguageName } - ${ voice?.Name } (${ voice?.Gender })`,
 							};
 						} ) }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 		</>
diff --git a/src/js/settings/components/provider-settings/azure-text-to-speech.js b/src/js/settings/components/provider-settings/azure-text-to-speech.js
index f486c5a79..e66d8c5fd 100644
--- a/src/js/settings/components/provider-settings/azure-text-to-speech.js
+++ b/src/js/settings/components/provider-settings/azure-text-to-speech.js
@@ -93,6 +93,7 @@ export const AzureTextToSpeechSettings = ( { isConfigured = false } ) => {
 								value: `${ ele.ShortName }|${ ele.Gender }`,
 							} )
 						) }
+						__nextHasNoMarginBottom
 					/>
 				</SettingsRow>
 			) }
diff --git a/src/js/settings/components/provider-settings/index.js b/src/js/settings/components/provider-settings/index.js
index 8567c4978..18bb13010 100644
--- a/src/js/settings/components/provider-settings/index.js
+++ b/src/js/settings/components/provider-settings/index.js
@@ -168,6 +168,7 @@ export const ProviderSettings = () => {
 							}
 							value={ provider }
 							options={ providers }
+							__nextHasNoMarginBottom
 						/>
 					</SettingsRow>
 				) }
diff --git a/src/js/settings/components/provider-settings/openai-dalle.js b/src/js/settings/components/provider-settings/openai-dalle.js
index 9431c06b5..d147bcbcb 100644
--- a/src/js/settings/components/provider-settings/openai-dalle.js
+++ b/src/js/settings/components/provider-settings/openai-dalle.js
@@ -78,6 +78,7 @@ export const OpenAIDallESettings = ( { isConfigured = false } ) => {
 						label: i + 1,
 						value: i + 1,
 					} ) ) }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -101,6 +102,7 @@ export const OpenAIDallESettings = ( { isConfigured = false } ) => {
 							value: 'hd',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -128,6 +130,7 @@ export const OpenAIDallESettings = ( { isConfigured = false } ) => {
 							value: '1024x1792',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -151,6 +154,7 @@ export const OpenAIDallESettings = ( { isConfigured = false } ) => {
 							value: 'natural',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 		</>
diff --git a/src/js/settings/components/provider-settings/openai-text-to-speech.js b/src/js/settings/components/provider-settings/openai-text-to-speech.js
index 127b71706..e8991b7a3 100644
--- a/src/js/settings/components/provider-settings/openai-text-to-speech.js
+++ b/src/js/settings/components/provider-settings/openai-text-to-speech.js
@@ -101,6 +101,7 @@ export const OpenAITextToSpeachSettings = ( { isConfigured = false } ) => {
 							value: 'tts-1-hd',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -149,6 +150,7 @@ export const OpenAITextToSpeachSettings = ( { isConfigured = false } ) => {
 							value: 'shimmer',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
@@ -172,6 +174,7 @@ export const OpenAITextToSpeachSettings = ( { isConfigured = false } ) => {
 							value: 'wav',
 						},
 					] }
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 			<SettingsRow
diff --git a/src/js/settings/components/service-settings/index.js b/src/js/settings/components/service-settings/index.js
index 1a321592d..f175f29db 100644
--- a/src/js/settings/components/service-settings/index.js
+++ b/src/js/settings/components/service-settings/index.js
@@ -1,55 +1,181 @@
 /**
  * External dependencies
  */
-import { NavLink, Outlet, useParams } from 'react-router-dom';
+import { NavLink, useParams } from 'react-router-dom';
 
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useDispatch } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
+import { useSelect, useDispatch } from '@wordpress/data';
+import {
+	Flex,
+	FlexItem,
+	FlexBlock,
+	ToggleControl,
+	Button,
+	Panel,
+	PanelBody,
+	Notice,
+	Icon,
+} from '@wordpress/components';
+import { useEffect, useRef } from '@wordpress/element';
+import apiFetch from '@wordpress/api-fetch';
 
 /**
  * Internal dependencies
  */
 import { STORE_NAME } from '../../data/store';
+import { isProviderConfigurationNeeded } from '../../utils/utils';
 const { features } = window.classifAISettings;
 
+/**
+ * ConfigureProviderNotice component to render the notice when the provider is not configured correctly.
+ *
+ * @return {Object} The ServiceSettings component.
+ */
+const ConfigureProviderNotice = () => (
+	<Notice
+		status="warning"
+		isDismissible={ false }
+		className="classifai-configure-provider-notice"
+	>
+		<Icon icon="warning" />{ ' ' }
+		{ __(
+			'This Feature is enabled but needs a Provider configured. Please click the Settings button to complete the setup.',
+			'classifai'
+		) }
+	</Notice>
+);
+
 /**
  * ServiceSettings component to render the feature navigation tabs and the feature settings.
  *
  * @return {Object} The ServiceSettings component.
  */
 export const ServiceSettings = () => {
-	const { setCurrentService } = useDispatch( STORE_NAME );
+	const { setCurrentService, setIsSaving, setSettings } =
+		useDispatch( STORE_NAME );
+
 	const { service } = useParams();
+	const isInitialPageLoad = useRef( true );
+
+	const { settings, getFeatureSettings } = useSelect( ( select ) => {
+		const store = select( STORE_NAME );
+
+		return {
+			settings: store.getSettings(),
+			getFeatureSettings: ( key, featureName ) =>
+				store.getFeatureSettings( key, featureName ),
+		};
+	} );
+
 	useEffect( () => {
 		setCurrentService( service );
 	}, [ service, setCurrentService ] );
 
 	const serviceFeatures = features[ service ] || {};
+
+	const saveSettings = () => {
+		setIsSaving( true );
+		apiFetch( {
+			path: '/classifai/v1/settings/',
+			method: 'POST',
+			data: {
+				settings,
+				is_setup: true,
+				step: 'enable_features',
+			},
+		} ).then( ( res ) => {
+			if ( res.errors && res.errors.length ) {
+				setIsSaving( false );
+				return;
+			}
+
+			setSettings( res.settings );
+			setIsSaving( false );
+		} );
+	};
+
+	const statuses = Object.keys( settings )
+		.map( ( key ) => settings[ key ]?.status )
+		.join( '' );
+
+	useEffect( () => {
+		if ( isInitialPageLoad.current ) {
+			isInitialPageLoad.current = false;
+			return;
+		}
+		saveSettings();
+	}, [ statuses ] );
+
 	return (
-		<div className="service-settings-wrapper">
-			<div className="classifai-tabs" aria-orientation="vertical">
-				{ Object.keys( serviceFeatures ).map( ( feature ) => (
-					<NavLink
-						to={ feature }
-						key={ feature }
-						className={ ( { isActive } ) =>
-							isActive
-								? 'active-tab classifai-tabs-item'
-								: 'classifai-tabs-item'
-						}
-					>
-						{ serviceFeatures[ feature ]?.label ||
-							__( 'Feature', 'classifai' ) }
-					</NavLink>
-				) ) }
-			</div>
-			<div className="feature-settings-wrapper">
-				<Outlet />
-			</div>
+		<div className="classifai-settings-dashboard">
+			{ Object.keys( serviceFeatures ).map( ( feature, index ) => (
+				<Panel key={ index }>
+					<PanelBody>
+						<Flex gap={ 8 } align="top">
+							<FlexItem style={ { marginTop: '4px' } }>
+								<Flex gap={ 2 }>
+									<ToggleControl
+										className="classifai-feature-status"
+										checked={
+											'1' ===
+											getFeatureSettings(
+												'status',
+												feature
+											)
+										}
+										onChange={ ( value ) =>
+											wp.data
+												.dispatch( STORE_NAME )
+												.setFeatureSettings(
+													{
+														status: value
+															? '1'
+															: '0',
+													},
+													feature
+												)
+										}
+										__nextHasNoMarginBottom
+									/>
+								</Flex>
+							</FlexItem>
+							<FlexBlock>
+								<strong>
+									{ serviceFeatures[ feature ]?.label }
+								</strong>
+								<div
+									dangerouslySetInnerHTML={ {
+										__html: serviceFeatures[ feature ]
+											?.enable_description,
+									} }
+								/>
+								{ !! isProviderConfigurationNeeded(
+									getFeatureSettings( '', feature )
+								) && <ConfigureProviderNotice /> }
+							</FlexBlock>
+							<FlexItem>
+								<NavLink to={ feature } key={ feature }>
+									<Button
+										variant="secondary"
+										disabled={
+											'1' !==
+											getFeatureSettings(
+												'status',
+												feature
+											)
+										}
+									>
+										{ __( 'Settings', 'classifai' ) }
+									</Button>
+								</NavLink>
+							</FlexItem>
+						</Flex>
+					</PanelBody>
+				</Panel>
+			) ) }
 		</div>
 	);
 };
diff --git a/src/js/settings/components/user-permissions/index.js b/src/js/settings/components/user-permissions/index.js
index 033ae379a..4a3eadd70 100644
--- a/src/js/settings/components/user-permissions/index.js
+++ b/src/js/settings/components/user-permissions/index.js
@@ -77,6 +77,7 @@ export const UserPermissions = () => {
 						} );
 					} }
 					className="classifai-settings__user-based-opt-out"
+					__nextHasNoMarginBottom
 				/>
 			</SettingsRow>
 		</PanelBody>
diff --git a/src/js/settings/utils/utils.js b/src/js/settings/utils/utils.js
index 5e523c012..8e2deeb4f 100644
--- a/src/js/settings/utils/utils.js
+++ b/src/js/settings/utils/utils.js
@@ -187,33 +187,21 @@ export const useUserPermissionsPreferences = () => {
 export const isFeatureActive = ( feature ) => {
 	const isEnabled = '1' === feature.status;
 	const provider = feature?.provider;
-	const authenticated = feature[ provider ].authenticated;
+	const authenticated = feature[ provider ]?.authenticated;
 
 	return isEnabled && authenticated;
 };
 
 /**
- * Returns the onboarding steps.
+ * Returns true if a provider configuration is needed.
  *
- * @return {Array} Array of onboarding steps.
+ * @param {Object} feature The feature object.
+ * @return {boolean} True if the feature is enabled and provider configuration is needed, false otherwise.
  */
-export const getOnboardingSteps = () => {
-	return [
-		'enable_features',
-		'classifai_registration',
-		'configure_features',
-		'finish',
-	];
-};
+export const isProviderConfigurationNeeded = ( feature ) => {
+	const isEnabled = '1' === feature.status;
+	const provider = feature?.provider;
+	const authenticated = feature[ provider ]?.authenticated;
 
-/**
- * Get the next step in the onboarding process.
- *
- * @param {string} currentStep
- * @return {string} The next step in the onboarding process.
- */
-export const getNextOnboardingStep = ( currentStep ) => {
-	const steps = getOnboardingSteps();
-	const currentIndex = steps.indexOf( currentStep );
-	return steps[ currentIndex + 1 ];
+	return isEnabled && ! authenticated;
 };
diff --git a/src/scss/admin.scss b/src/scss/admin.scss
index ce378111a..61beb70c6 100644
--- a/src/scss/admin.scss
+++ b/src/scss/admin.scss
@@ -62,7 +62,7 @@ body.admin-color-sunrise {
 }
 
 #classifai-activation-notice {
-	padding: 24px;
+	padding: 20px 10px;
 
 	.classifai-logo {
 		line-height: 0;
@@ -72,11 +72,8 @@ body.admin-color-sunrise {
 		}
 	}
 
-	h3.classifai-activation-message {
-		margin: 8px 0 18px;
-		font-weight: 400;
-		line-height: 1.3;
-		font-size: 1.6em;
+	.classifai-activation-message {
+		margin: 16px 0px;
 	}
 }
 
@@ -169,9 +166,12 @@ input.classifai-button {
 
 	.classifai-header-layout {
 		justify-content: space-between;
-		padding: 18px;
+		padding: 18px 20px;
 		display: flex;
 		align-items: center;
+		max-width: 1260px;
+		margin: 0 auto;
+		box-sizing: content-box;
 	}
 
 	#classifai-logo {
@@ -195,7 +195,7 @@ input.classifai-button {
 			position: relative;
 			outline: none;
 			cursor: pointer;
-			margin-left: 24px;
+			height: 32px;
 		}
 
 		a.classifai-help-links {
@@ -243,7 +243,7 @@ input.classifai-button {
 		background-color: #fff;
 		border-radius: 4px;
 		padding: 24px;
-		margin: 0px 20px 0px 0px;
+		margin: 0px;
 
 		.form-table td fieldset p {
 			margin-bottom: 12px;
@@ -360,6 +360,18 @@ input.classifai-button {
 		}
 	}
 
+	.classifai-settings-wrapper {
+		width: 100%;
+		max-width: 1280px;
+		margin: 0 auto;
+		padding-right: 20px;
+		box-sizing: border-box;
+
+		@media screen and (max-width: 782px) {
+			padding-right: 10px;
+		}
+	}
+
 	input[type="text"],
 	input[type="password"] {
 		height: 38px;
@@ -389,7 +401,7 @@ input.classifai-button {
 		border: none;
 		margin-left: 0;
 		background: transparent;
-		padding: 9px 12px;
+		padding: 8px 12px;
 		position: relative;
 
 		&:after {
@@ -537,7 +549,6 @@ input.classifai-button {
 		display: block;
 		border-radius: 4px;
 		margin: 20px;
-		padding-bottom: 48px;
 
 		&__row {
 			display: flex;
diff --git a/src/scss/settings.scss b/src/scss/settings.scss
index 6cba5f189..d2916ef42 100644
--- a/src/scss/settings.scss
+++ b/src/scss/settings.scss
@@ -32,13 +32,17 @@
 
 		.classifai-header-layout {
 			justify-content: space-between;
-			padding: 18px 28px;
+			padding: 18px 20px;
 			display: flex;
 			align-items: center;
 			margin: 0 auto;
+			padding: 18px 20px;
+			max-width: 1260px;
+    		box-sizing: content-box;
+			position: relative;
 
 			@media screen and (max-width: 782px) {
-				padding: 18px;
+				padding: 18px 10px;
 			}
 		}
 
@@ -61,6 +65,7 @@
 
 		&.personalizer-deprecation-notice,
 		&.is-info {
+			margin-top: 16px;
 			margin-bottom: 16px;
 		}
 	}
@@ -70,9 +75,12 @@
 		flex-direction: column;
 		gap: 8px;
 		margin-block-end: 16px;
+		margin-top: 16px;
 	}
 
 	.settings-panel {
+		margin-top: 16px;
+
 		.settings-row {
 			display: flex;
 			justify-content: flex-start;
@@ -90,13 +98,13 @@
 			align-items: center;
 			font-weight: bold;
 			flex-shrink: 0;
-			flex: 30%;
+			flex: 20%;
 			padding: 12px 0px;
 		}
 
 		.settings-control {
 			align-items: center;
-			flex: 70%;
+			flex: 80%;
 			padding: 12px 10px;
 		}
 
@@ -113,24 +121,21 @@
 			display: none;
 		}
 
-		@media screen and (max-width: 782px) {
-			margin-top: 16px;
+		.components-base-control.components-checkbox-control {
+			margin-bottom: 8px;
 		}
-	}
 
-	.save-settings-button{
-		margin-top: 16px;
-		display: block;
-		width: 100%;
-		padding: 10px 0;
-		height: auto;
-		font-size: 15px;
+		.classifai-panel-header-close {
+			margin-right: -10px;
+		}
 	}
 
 	.classifai-settings-wrapper {
 		width: 100%;
 		max-width: 1280px;
 		margin: 0 auto;
+		padding-right: 20px;
+		box-sizing: border-box;
 
 		.classifai-tabs {
 			display: flex;
@@ -139,7 +144,6 @@
 			justify-content: flex-start;
 			border-bottom: 1px solid #ccd0d4;
 			padding-bottom: 0;
-			margin-right: 20px;
 
 			&[aria-orientation="vertical"] {
 				flex-direction: column;
@@ -184,8 +188,7 @@
 			}
 
 			@media screen and (max-width: 782px) {
-				margin-right: 10px;
-				margin-top: 12px;
+				margin-top: 16px;
 			}
 
 			.classifai-tabs-item {
@@ -195,8 +198,9 @@
 				border: none;
 				box-shadow: none;
 				cursor: pointer;
-				padding: 14px 16px;
+				padding: 14px 12px;
 				margin-left: 0;
+				margin-right: 1rem;
 				font-weight: 500;
 				text-decoration: none;
 				font-size: 15px;
@@ -233,6 +237,10 @@
 				}
 
 				// Active.
+				&.active-tab {
+					color:var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
+				}
+
 				&.active-tab::after {
 					height: calc(1 * var(--wp-admin-border-width-focus));
 
@@ -286,7 +294,6 @@
 			position: relative;
 			display: flex;
 			flex-direction:column;
-			max-width: 600px;
 
 			&:first-child {
 				> input,
@@ -359,6 +366,10 @@
 		.components-radio-control__option {
 			margin-bottom: 4px;
 		}
+
+		@media screen and (max-width: 782px) {
+			padding-right: 10px;
+		}
 	}
 
 	.service-settings-wrapper {
@@ -401,10 +412,19 @@
 
 	.classifai-setup__content {
 		margin-left: 0px;
+		margin-right: 0px;
+	}
 
-		@media screen and (max-width: 782px) {
-			margin-right: 10px;
-		}
+	.classifai-configure-provider-notice {
+		margin-top: 0.5rem;
+	}
+
+	.classifai-settings-footer {
+		margin: 16px 0px;
+	}
+
+	.classifai-admin-notices {
+		margin-right: 0px;
 	}
 }
 
@@ -431,6 +451,18 @@
 	&__welcome-to-classifai {
 		text-align: center;
 	}
+
+	&__welcome-note {
+
+		p {
+			font-size: 14px;
+    		margin: 1.2em 0;
+		}
+
+		li {
+			margin-bottom: 12px;
+		}
+	}
 }
 
 // Previewer.
@@ -572,3 +604,19 @@
 	margin: 0 auto;
 	top: 1rem;
 }
+
+.classifai-settings-dashboard {
+	margin-top: 16px;
+}
+
+.classifai-feature-status {
+	margin-bottom: 0 !important;
+
+	.components-flex {
+		gap: 0 !important;
+	}
+}
+
+.classifai-settings__main-title {
+	margin-top: 2.5rem;
+}
diff --git a/tests/cypress/integration/admin.test.js b/tests/cypress/integration/admin.test.js
index dbcb89b34..a4a60eb0c 100644
--- a/tests/cypress/integration/admin.test.js
+++ b/tests/cypress/integration/admin.test.js
@@ -18,7 +18,7 @@ describe( 'Admin can login and make sure plugin is activated', () => {
 
 		// Check Heading
 		cy.visit( '/wp-admin/tools.php?page=classifai' );
-		cy.get( '#wpbody h2' ).contains( 'Classification Settings' );
+		cy.get( '.classifai-settings-wrapper' ).should( 'exist' );
 		cy.get( '.classifai-tabs' ).should( 'exist' );
 		cy.get( '.classifai-tabs a' ).first().contains( 'Language Processing' );
 	} );
diff --git a/tests/cypress/integration/admin/common-feature-fields.test.js b/tests/cypress/integration/admin/common-feature-fields.test.js
index fb3ea9f61..de44ec459 100644
--- a/tests/cypress/integration/admin/common-feature-fields.test.js
+++ b/tests/cypress/integration/admin/common-feature-fields.test.js
@@ -18,44 +18,67 @@ describe( 'Common Feature Fields', () => {
 		feature_pdf_to_text_generation: 'PDF Text Extraction',
 	};
 
+	const services = {
+		language_processing: {
+			feature_classification: 'Classification',
+			feature_title_generation: 'Title Generation',
+			feature_excerpt_generation: 'Excerpt Generation',
+			feature_content_resizing: 'Content Resizing',
+			feature_text_to_speech_generation: 'Text to Speech',
+			feature_audio_transcripts_generation: 'Audio Transcripts Generation',
+		},
+		image_processing: {
+			feature_image_generation: 'Image Generation',
+			feature_descriptive_text_generator: 'Descriptive Text Generator',
+			feature_image_tags_generator: 'Image Tags Generator',
+			feature_image_cropping: 'Image Cropping',
+			feature_image_to_text_generator: 'Image Text Extraction',
+			feature_pdf_to_text_generation: 'PDF Text Extraction',
+		},
+	};
+
 	const allowedRoles = [ 'administrator', 'editor', 'author', 'contributor' ];
 
-	Object.keys( features ).forEach( ( feature ) => {
-		it( `"${ features[ feature ] }" feature common fields`, () => {
-			cy.visitFeatureSettings( `language_processing/${ feature }` );
+	Object.keys( services ).forEach( ( service ) => {
+		const features = services[ service ];
 
-			cy.get( '.classifai-enable-feature-toggle input' ).should(
-				'exist'
-			);
-			cy.openUserPermissionsPanel();
-			cy.get(
-				'.classifai-settings__user-based-opt-out input[type="checkbox"]'
-			).should( 'exist' );
-			cy.get( 'body' ).then( ( $body ) => {
-				if (
-					$body.find( '.classifai-settings-edit-provider' ).length > 0
-				) {
-					cy.get( '.classifai-settings-edit-provider' ).click();
+		Object.keys( features ).forEach( ( feature ) => {
+			it( `"${ features[ feature ] }" feature common fields`, () => {
+				cy.visitFeatureSettings( `${ service }/${ feature }` );
+	
+				cy.get( '.classifai-enable-feature-toggle input' ).should(
+					'exist'
+				);
+				cy.openUserPermissionsPanel();
+				cy.get(
+					'.classifai-settings__user-based-opt-out input[type="checkbox"]'
+				).should( 'exist' );
+				cy.get( 'body' ).then( ( $body ) => {
+					if (
+						$body.find( '.classifai-settings-edit-provider' ).length > 0
+					) {
+						cy.get( '.classifai-settings-edit-provider' ).click();
+					}
+				} );
+				cy.get( '.classifai-provider-select select' ).should( 'exist' );
+	
+				for ( const role of allowedRoles ) {
+					if (
+						'feature_image_generation' === feature &&
+						'contributor' === role
+					) {
+						continue;
+					}
+	
+					const roleField = cy.get(
+						`.settings-allowed-roles input#${ role }`
+					);
+					roleField.should( 'be.visible' );
+					roleField.should( 'have.value', 1 );
 				}
+	
+				cy.get( '.classifai-settings__users' ).should( 'be.visible' );
 			} );
-			cy.get( '.classifai-provider-select select' ).should( 'exist' );
-
-			for ( const role of allowedRoles ) {
-				if (
-					'feature_image_generation' === feature &&
-					'contributor' === role
-				) {
-					continue;
-				}
-
-				const roleField = cy.get(
-					`.settings-allowed-roles input#${ role }`
-				);
-				roleField.should( 'be.visible' );
-				roleField.should( 'have.value', 1 );
-			}
-
-			cy.get( '.classifai-settings__users' ).should( 'be.visible' );
 		} );
 	} );
 } );
diff --git a/tests/cypress/integration/image-processing/image-processing-microsoft-azure.test.js b/tests/cypress/integration/image-processing/image-processing-microsoft-azure.test.js
index 6e2a972cb..b6968a976 100644
--- a/tests/cypress/integration/image-processing/image-processing-microsoft-azure.test.js
+++ b/tests/cypress/integration/image-processing/image-processing-microsoft-azure.test.js
@@ -17,6 +17,7 @@ describe( 'Image processing Tests', () => {
 
 		imageProcessingFeatures.forEach( ( feature ) => {
 			cy.visitFeatureSettings( `image_processing/${ feature }` );
+			cy.wait( 100 );
 			cy.enableFeature();
 			cy.selectProvider( 'ms_computer_vision' );
 			cy.get( '#ms_computer_vision_endpoint_url' )
diff --git a/tests/cypress/integration/language-processing/classify-content-azure-openai-embeddings.test.js b/tests/cypress/integration/language-processing/classify-content-azure-openai-embeddings.test.js
index 9650a0bb8..e8102df26 100644
--- a/tests/cypress/integration/language-processing/classify-content-azure-openai-embeddings.test.js
+++ b/tests/cypress/integration/language-processing/classify-content-azure-openai-embeddings.test.js
@@ -197,7 +197,7 @@ describe( '[Language processing] Classify Content (Azure OpenAI) Tests', () => {
 
 	it( 'Can enable/disable content classification feature by role', () => {
 		// Remove custom taxonomies so those don't interfere with the test.
-		cy.visitFeatureSettings( 'language_processing' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		// Disable access for all users.
 		cy.disableFeatureForUsers();
diff --git a/tests/cypress/integration/language-processing/classify-content-ibm-watson.test.js b/tests/cypress/integration/language-processing/classify-content-ibm-watson.test.js
index 9d55462c5..dee56af97 100644
--- a/tests/cypress/integration/language-processing/classify-content-ibm-watson.test.js
+++ b/tests/cypress/integration/language-processing/classify-content-ibm-watson.test.js
@@ -64,7 +64,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 	} );
 
 	it( 'Can select Watson taxonomies "Language Processing" settings', () => {
-		cy.visitFeatureSettings( 'language_processing' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		cy.enableFeature();
 		cy.get( '#category-taxonomy' ).select( 'watson-category' );
@@ -92,7 +92,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 	} );
 
 	it( 'Check Classification Mode toggle button is off, display popup, then add/remove terms', () => {
-		cy.visitFeatureSettings( 'language_processing' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		cy.selectProvider( 'ibm_watson_nlu' );
 		cy.get(
@@ -463,7 +463,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 
 	it( 'Can limit Natural Language Understanding features by users', () => {
 		// Disable access.
-		cy.visitFeatureSettings( 'language_processing&provider=watson_nlu' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		// Disable access for all roles.
 		cy.openUserPermissionsPanel();
@@ -480,7 +480,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 		cy.verifyClassifyContentEnabled( false );
 
 		// Enable access to user.
-		cy.visitFeatureSettings( 'language_processing&provider=watson_nlu' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		// Disable access for all roles.
 		cy.get( '.settings-allowed-roles input[type="checkbox"]' ).uncheck( {
@@ -513,7 +513,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 		cy.verifyClassifyContentEnabled( true );
 
 		// Enable access to admin role. (default)
-		cy.visitFeatureSettings( 'language_processing&provider=watson_nlu' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		// Enable access for all roles.
 		cy.openUserPermissionsPanel();
@@ -529,7 +529,7 @@ describe( '[Language processing] Classify content (IBM Watson - NLU) Tests', ()
 
 	it( 'Can enable user based opt out for Natural Language Understanding', () => {
 		// Opt Out from feature.
-		cy.visitFeatureSettings( 'language_processing&provider=watson_nlu' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 		// Enable access for all roles.
 		cy.openUserPermissionsPanel();
 		cy.get( '.settings-allowed-roles input[type="checkbox"]' ).check( {
diff --git a/tests/cypress/integration/language-processing/classify-content-openai-embeddings.test.js b/tests/cypress/integration/language-processing/classify-content-openai-embeddings.test.js
index 9d4000ea2..e5a2f526f 100644
--- a/tests/cypress/integration/language-processing/classify-content-openai-embeddings.test.js
+++ b/tests/cypress/integration/language-processing/classify-content-openai-embeddings.test.js
@@ -188,7 +188,7 @@ describe( '[Language processing] Classify Content (OpenAI) Tests', () => {
 
 	it( 'Can enable/disable content classification feature by role', () => {
 		// Remove custom taxonomies so those don't interfere with the test.
-		cy.visitFeatureSettings( 'language_processing' );
+		cy.visitFeatureSettings( 'language_processing/feature_classification' );
 
 		// Disable access for all users.
 		cy.disableFeatureForUsers();