diff --git a/Readme.txt b/Readme.txt
index bfebc4d0..aa947179 100755
--- a/Readme.txt
+++ b/Readme.txt
@@ -2,9 +2,9 @@
 Contributors: reepaydenmark,aaitse
 Tags: billwerk+, visa, mastercard, dankort, mobilepay
 Requires at least: 4.0
-Tested up to: 6.6.1
+Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 1.7.10
+Stable tag: 1.7.11
 License: GPL
 License URI: http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
 
@@ -18,6 +18,12 @@ The Billwerk+ Pay plugin extends WooCommerce allowing you to take payments on yo
 See installation guide right here: https://docu.billwerk.plus/help/en/apps/woocommerce/setup-woocommerce-plugin.html
 
 == Changelog ==
+v 1.7.11
+- [Fix] - VAT added as compound rate got computed twice.
+- [Fix] - Shows no Payment logos when none are selected in settings.
+- [Improvement] - Payment method logo height defaults to 20px.
+- [Improvement] - Support WordPress version 6.7
+
 v 1.7.10
 - [Fix] - Discount coupons for regular products couldn't be used if a Billwerk subscription product was also in the cart.
 - [Fix] - The order confirmation page now shows a list of split orders (for regular and subscription products) with correct total amounts.
diff --git a/composer.json b/composer.json
index d6ba9060..c933b735 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "Get a plug-n-play payment solution for WooCommerce, that is easy to use, highly secure and is built to maximize the potential of your e-commerce.",
     "type": "wordpress-plugin",
     "license": "GPL",
-    "version": "1.7.10",
+    "version": "1.7.11",
     "autoload": {
         "psr-4": {
             "Reepay\\Checkout\\": "includes/",
diff --git a/includes/Admin/Ajax.php b/includes/Admin/Ajax.php
index 3c42e0ac..d4a492f9 100644
--- a/includes/Admin/Ajax.php
+++ b/includes/Admin/Ajax.php
@@ -70,7 +70,7 @@ public function capture() {
 		$this->verify_nonce();
 
 		if ( empty( $_REQUEST['order_id'] ) ) {
-			wp_send_json_error( __( 'Order id not specified' ) );
+			wp_send_json_error( __( 'Order id not specified', 'reepay-checkout-gateway' ) );
 		}
 
 		$order_id = (int) wc_clean( $_REQUEST['order_id'] );
@@ -93,7 +93,7 @@ public function cancel() {
 		$this->verify_nonce();
 
 		if ( empty( $_REQUEST['order_id'] ) ) {
-			wp_send_json_error( __( 'Order id not specified' ) );
+			wp_send_json_error( __( 'Order id not specified', 'reepay-checkout-gateway' ) );
 		}
 
 		$order_id = (int) wc_clean( $_REQUEST['order_id'] );
@@ -129,7 +129,7 @@ public function refund() {
 		$this->verify_nonce();
 
 		if ( empty( $_REQUEST['order_id'] ) ) {
-			wp_send_json_error( __( 'Order id not specified' ) );
+			wp_send_json_error( __( 'Order id not specified', 'reepay-checkout-gateway' ) );
 		}
 
 		$order_id = (int) wc_clean( $_REQUEST['order_id'] );
@@ -216,7 +216,7 @@ public function set_complete_settle_transient() {
 		$this->verify_nonce( 'reepay' );
 
 		if ( empty( $_POST['order_id'] ) || empty( $_POST['settle_order'] ) ) {
-			wp_send_json_error( __( 'Order id or settle order not specified' ) );
+			wp_send_json_error( __( 'Order id or settle order not specified', 'reepay-checkout-gateway' ) );
 		}
 
 		$order_id     = wc_clean( $_POST['order_id'] );
diff --git a/includes/Api/Controller/DebugController.php b/includes/Api/Controller/DebugController.php
index 7b63c87a..90a3fd66 100644
--- a/includes/Api/Controller/DebugController.php
+++ b/includes/Api/Controller/DebugController.php
@@ -74,7 +74,7 @@ public function run_debug( WP_REST_Request $request ) {
 	 */
 	public function get_items_permissions_check( $request ) {
 		if ( ! current_user_can( 'manage_options' ) ) {
-			return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.', 'reepay-checkout-gateway' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		return true;
diff --git a/includes/Api/Controller/MetaFieldsController.php b/includes/Api/Controller/MetaFieldsController.php
index b048e4fc..17a14a10 100644
--- a/includes/Api/Controller/MetaFieldsController.php
+++ b/includes/Api/Controller/MetaFieldsController.php
@@ -395,7 +395,7 @@ public function get_order_meta_fields( WP_REST_Request $request ) {
 		$order     = wc_get_order( $id );
 
 		if ( ! $order ) {
-			return new WP_Error( 'not_found', esc_html__( 'Not found order.' ) );
+			return new WP_Error( 'not_found', esc_html__( 'Not found order.', 'reepay-checkout-gateway' ) );
 		}
 
 		$meta_data = $order->get_meta_data();
@@ -427,7 +427,7 @@ public function get_user_meta_fields( WP_REST_Request $request ) {
 		$user      = get_user_by( 'id', $id );
 
 		if ( ! $user ) {
-			return new WP_Error( 'not_found', esc_html__( 'Not found user.' ) );
+			return new WP_Error( 'not_found', esc_html__( 'Not found user.', 'reepay-checkout-gateway' ) );
 		}
 
 		$meta_data = get_user_meta( $id );
@@ -472,7 +472,7 @@ public function add_user_meta_field( WP_REST_Request $request ) {
 		$user = get_user_by( 'id', $id );
 
 		if ( ! $user ) {
-			return new WP_Error( 'not_found', esc_html__( 'Not found user.' ) );
+			return new WP_Error( 'not_found', esc_html__( 'Not found user.', 'reepay-checkout-gateway' ) );
 		}
 
 		$decoded_value = json_decode( $value, true );
@@ -560,7 +560,7 @@ public function edit_user_meta_field( WP_REST_Request $request ) {
 	 */
 	public function get_items_permissions_check( $request ) {
 		if ( ! current_user_can( 'edit_posts' ) && ! current_user_can( 'delete_posts' ) ) {
-			return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.' ), array( 'status' => rest_authorization_required_code() ) );
+			return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.', 'reepay-checkout-gateway' ), array( 'status' => rest_authorization_required_code() ) );
 		}
 
 		return true;
diff --git a/includes/Gateways/Mobilepay.php b/includes/Gateways/Mobilepay.php
index b38eb15e..976dc1df 100644
--- a/includes/Gateways/Mobilepay.php
+++ b/includes/Gateways/Mobilepay.php
@@ -86,7 +86,7 @@ public function warning_message() {
 		?>
 		<div class="woo-connect-notice notice notice-error">
 			<p>
-				<?php _e( 'The new Vipps MobilePay payment method, which utilizes bank transfers instead of card payments, will replace the old MobilePay Online payment method. Please refer to Vipps MobilePay for more efficient transactions and a better conversion rate.', 'reepay-checkout-gateway' ); ?>
+				<?php esc_html_e( 'The new Vipps MobilePay payment method, which utilizes bank transfers instead of card payments, will replace the old MobilePay Online payment method. Please refer to Vipps MobilePay for more efficient transactions and a better conversion rate.', 'reepay-checkout-gateway' ); ?>
 			</p>
 		</div>
 		<?php
diff --git a/includes/Gateways/MobilepaySubscriptions.php b/includes/Gateways/MobilepaySubscriptions.php
index 48da819b..27aba2e0 100644
--- a/includes/Gateways/MobilepaySubscriptions.php
+++ b/includes/Gateways/MobilepaySubscriptions.php
@@ -129,7 +129,7 @@ public function admin_notice_message() {
 		?>
 		<div class="woo-connect-notice notice notice-error">
 			<p>
-				<?php echo $this->warning_message(); ?>
+				<?php echo esc_html( $this->warning_message() ); ?>
 			</p>
 		</div>
 		<?php
diff --git a/includes/Gateways/ReepayCheckout.php b/includes/Gateways/ReepayCheckout.php
index 16ca2ef9..0c1410c8 100644
--- a/includes/Gateways/ReepayCheckout.php
+++ b/includes/Gateways/ReepayCheckout.php
@@ -222,7 +222,7 @@ public function init_form_fields() {
 				'sanitize_callback' => function ( $value ) {
 					if ( ! empty( $value ) ) {
 						if ( ! is_email( $value ) ) {
-							throw new Exception( __( 'Email address is invalid.', 'reepay-checkout-gateway' ) );
+							throw new Exception( esc_html__( 'Email address is invalid.', 'reepay-checkout-gateway' ) );
 						}
 					}
 
@@ -375,7 +375,7 @@ public function init_form_fields() {
 				'title'       => __( 'Logo Height', 'reepay-checkout-gateway' ),
 				'type'        => 'text',
 				'description' => __( 'Set the Logo height in pixels', 'reepay-checkout-gateway' ),
-				'default'     => '',
+				'default'     => 20,
 			),
 			'hr7'                        => array(
 				'type' => 'separator',
@@ -472,7 +472,7 @@ public function generate_account_info_html( string $key, array $data ): string {
 				<fieldset>
 					<?php if ( ! is_wp_error( $info ) && ! empty( $info[ $data['info_type'] ] ) ) : ?>
 						<span>
-							<?php echo $info[ $data['info_type'] ]; ?>
+							<?php echo esc_attr( $info[ $data['info_type'] ] ); ?>
 						</span>
 					<?php endif; ?>
 				</fieldset>
@@ -513,7 +513,7 @@ public function generate_verify_key_html( string $key, array $data ): string {
 			<td class="forminp">
 				<fieldset>
 					<button name="save" class="button-primary woocommerce-save-button" type="submit" value="Save changes">
-						<?php _e( 'Save and verify', 'reepay-checkout-gateway' ); ?>
+						<?php esc_html_e( 'Save and verify', 'reepay-checkout-gateway' ); ?>
 					</button>
 				</fieldset>
 			</td>
@@ -555,7 +555,7 @@ public function generate_webhook_status_html( string $key, array $data ): string
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label><?php _e( 'Webhook', 'reepay-checkout-gateway' ); ?></label>
+				<label><?php esc_html_e( 'Webhook', 'reepay-checkout-gateway' ); ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -799,7 +799,7 @@ public function notice_message_live_key_changed() {
 		$notice_message = sprintf( __( 'The Api key identifies the Billwerk account. Only subscription plan handles that exist under the account of the API key can be used to submit subscription orders. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
 		?>
 		<div class="notice notice-info">
-			<p><?php echo $notice_message; ?></p>
+			<p><?php echo wp_kses_post( $notice_message ); ?></p>
 		</div>
 		<?php
 	}
@@ -812,7 +812,7 @@ public function notice_message_test_mode_enabled() {
 		$notice_message = sprintf( __( 'You just enabled test mode, meaning your test API key will now be used. Please note that all subscription products previously linked to plans on your live account are no longer linked. If you try to purchase a subscription product now, an error will occur. Disabling test mode will restore all connections. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
 		?>
 		<div class="notice notice-info">
-			<p><?php echo $notice_message; ?></p>
+			<p><?php echo wp_kses_post( $notice_message ); ?></p>
 		</div>
 		<?php
 	}
@@ -825,7 +825,7 @@ public function notice_message_test_mode_disabled() {
 		$notice_message = sprintf( __( 'You just disabled test mode, meaning your live API key will now be used. Please note that all subscription products previously linked to plans on your live account are now restored. If you haven\'t linked your subscription products with your test account, they will remain unlinked. <a href="%s" target="_blank">Read more about this here.</a>', 'reepay-checkout-gateway' ), 'https://optimize-docs.billwerk.com/reference/account' );
 		?>
 		<div class="notice notice-info">
-			<p><?php echo $notice_message; ?></p>
+			<p><?php echo wp_kses_post( $notice_message ); ?></p>
 		</div>
 		<?php
 	}
diff --git a/includes/Gateways/ReepayGateway.php b/includes/Gateways/ReepayGateway.php
index 617bb574..d0635617 100644
--- a/includes/Gateways/ReepayGateway.php
+++ b/includes/Gateways/ReepayGateway.php
@@ -100,20 +100,7 @@ abstract class ReepayGateway extends WC_Payment_Gateway {
 	 *
 	 * @var array
 	 */
-	public array $logos = array(
-		'dankort',
-		'visa',
-		'mastercard',
-		'visa-electron',
-		'maestro',
-		'mobilepay',
-		'viabill',
-		'applepay',
-		'paypal_logo',
-		'klarna-pay-later',
-		'klarna-pay-now',
-		'klarna',
-	);
+	public array $logos = array();
 
 	/**
 	 * Current payment type
@@ -647,13 +634,13 @@ public function capture_payment( $order, $amount = null ) {
 		$order = wc_get_order( $order );
 
 		if ( '1' === $order->get_meta( '_reepay_order_cancelled' ) ) {
-			throw new Exception( __( 'Order is canceled', 'reepay-checkout-gateway' ) );
+			throw new Exception( esc_html__( 'Order is canceled', 'reepay-checkout-gateway' ) );
 		}
 
 		$result = reepay()->api( $this )->capture_payment( $order, $amount );
 
 		if ( is_wp_error( $result ) ) {
-			throw new Exception( $result->get_error_message() );
+			throw new Exception( esc_html( $result->get_error_message() ) );
 		}
 	}
 
@@ -668,13 +655,13 @@ public function cancel_payment( $order ) {
 		$order = wc_get_order( $order );
 
 		if ( '1' === $order->get_meta( '_reepay_order_cancelled' ) ) {
-			throw new Exception( 'Order is already canceled' );
+			throw new Exception( esc_html__( 'Order is already canceled', 'reepay-checkout-gateway' ) );
 		}
 
 		$result = reepay()->api( $this )->cancel_payment( $order );
 
 		if ( is_wp_error( $result ) ) {
-			throw new Exception( $result->get_error_message() );
+			throw new Exception( esc_html( $result->get_error_message() ) );
 		}
 	}
 
@@ -692,21 +679,21 @@ public function refund_payment( $order, $amount = null, $reason = '' ) {
 		$order = wc_get_order( $order );
 
 		if ( '1' === $order->get_meta( '_reepay_order_cancelled' ) ) {
-			throw new Exception( 'Order is already canceled' );
+			throw new Exception( esc_html__( 'Order is already canceled', 'reepay-checkout-gateway' ) );
 		}
 
 		if ( ! $this->can_refund( $order ) ) {
-			throw new Exception( 'Payment can\'t be refunded.' );
+			throw new Exception( esc_html__( 'Payment can\'t be refunded.', 'reepay-checkout-gateway' ) );
 		}
 
 		if ( ! is_null( $amount ) && $amount <= 0 ) {
-			throw new Exception( 'Refund amount must be greater than 0.' );
+			throw new Exception( esc_html__( 'Refund amount must be greater than 0.', 'reepay-checkout-gateway' ) );
 		}
 
 		$result = reepay()->api( $this )->refund( $order, $amount, $reason );
 
 		if ( is_wp_error( $result ) ) {
-			throw new Exception( $result->get_error_message() );
+			throw new Exception( esc_html( $result->get_error_message() ) );
 		}
 	}
 
@@ -749,7 +736,7 @@ public function payment_fields() {
 		$description = $this->get_description();
 
 		if ( $description ) {
-			echo wpautop( wptexturize( $description ) );
+			echo wp_kses_post( wpautop( wptexturize( $description ) ) );
 		}
 	}
 
@@ -934,7 +921,7 @@ public function process_payment( $order_id ) {
 					$result = reepay()->api( $this )->recurring( $this->payment_methods, $order, $data, $token->get_token(), $params['button_text'] );
 
 					if ( is_wp_error( $result ) ) {
-						throw new Exception( $result->get_error_message(), $result->get_error_code() );
+						throw new Exception( esc_html( $result->get_error_message() ), esc_html( $result->get_error_code() ) );
 					}
 
 					if ( ! empty( $result['id'] ) ) {
@@ -943,7 +930,7 @@ public function process_payment( $order_id ) {
 					}
 
 					if ( is_wp_error( $result ) ) {
-						throw new Exception( $result->get_error_message(), $result->get_error_code() );
+						throw new Exception( esc_html( $result->get_error_message() ), esc_html( $result->get_error_code() ) );
 					}
 
 					try {
@@ -980,7 +967,7 @@ public function process_payment( $order_id ) {
 						return false;
 					} elseif ( ! empty( $method ) ) {
 						if ( 'active' !== $method['state'] ) {
-							wc_add_notice( __( 'You payment method has failed, please choose another or add new', 'error' ), 'error' );
+							wc_add_notice( __( 'You payment method has failed, please choose another or add new', 'reepay-checkout-gateway' ), 'error' );
 
 							return false;
 						}
@@ -1068,7 +1055,7 @@ public function process_payment( $order_id ) {
 			$result = reepay()->api( $this )->recurring( $this->payment_methods, $order, $data, false, $params['button_text'] );
 
 			if ( is_wp_error( $result ) ) {
-				throw new Exception( $result->get_error_message(), $result->get_error_code() );
+				throw new Exception( esc_html( $result->get_error_message() ), esc_html( $result->get_error_code() ) );
 			}
 
 			if ( ! empty( $result['id'] ) ) {
@@ -1301,7 +1288,7 @@ public function process_session_charge( array $params, WC_Order $order ): array
 		}
 
 		if ( is_wp_error( $result ) ) {
-			throw new Exception( $result->get_error_message(), $result->get_error_code() );
+			throw new Exception( esc_html( $result->get_error_message() ), esc_html( $result->get_error_code() ) );
 		} else {
 			return array(
 				'result'             => 'success',
@@ -1342,7 +1329,7 @@ public function reepay_cancel() {
 				$message = $result['transactions'][0]['card_transaction']['acquirer_message'];
 
 				$order->add_order_note( 'Payment failed. Error from acquire: ' . $message );
-				wc_add_notice( __( 'Payment error: ', 'error' ) . $message, 'error' );
+				wc_add_notice( __( 'Payment error: ', 'reepay-checkout-gateway' ) . $message, 'error' );
 			}
 
 			wp_redirect( wc_get_cart_url() );
diff --git a/includes/Integrations/WooBlocks/WooBlocksPaymentMethod.php b/includes/Integrations/WooBlocks/WooBlocksPaymentMethod.php
index 37ad6065..c318cd35 100644
--- a/includes/Integrations/WooBlocks/WooBlocksPaymentMethod.php
+++ b/includes/Integrations/WooBlocks/WooBlocksPaymentMethod.php
@@ -56,7 +56,8 @@ public function __construct( string $name ) {
 		$this->gateway = reepay()->gateways()->get_gateway( $this->name );
 
 		if ( is_null( $this->gateway ) ) {
-			throw new Exception( "Gateway '$this->name' not found" );
+			// translators: %s is the name of the gateway.
+			throw new Exception( sprintf( esc_html__( "Gateway '%s' not found", 'reepay-checkout-gateway' ), esc_html( $this->name ) ) );
 		}
 	}
 
diff --git a/includes/OrderFlow/OrderCapture.php b/includes/OrderFlow/OrderCapture.php
index 545a50d4..981f5a67 100644
--- a/includes/OrderFlow/OrderCapture.php
+++ b/includes/OrderFlow/OrderCapture.php
@@ -305,11 +305,10 @@ public function multi_settle( WC_Order $order ): bool {
 						$fees_item->set_tax_class( 'zero-rate' );
 						$fees_item->add_meta_data( '_is_card_fee', true );
 						$order->add_item( $fees_item );
-					}
 
-					$order->calculate_totals();
-					$order->save();
-					$order->calculate_totals();
+						$order->calculate_totals( false );
+						$order->save();
+					}
 				}
 			}
 		}
diff --git a/includes/OrderFlow/Webhook.php b/includes/OrderFlow/Webhook.php
index 53dc7510..c57c84e9 100644
--- a/includes/OrderFlow/Webhook.php
+++ b/includes/OrderFlow/Webhook.php
@@ -211,11 +211,10 @@ public function process( array $data ) {
 								$fees_item->set_tax_class( 'zero-rate' );
 								$fees_item->add_meta_data( '_is_card_fee', true );
 								$order->add_item( $fees_item );
-							}
 
-							$order->calculate_totals();
-							$order->save();
-							$order->calculate_totals();
+								$order->calculate_totals( false );
+								$order->save();
+							}
 						}
 					}
 				}
diff --git a/includes/Plugin/UpdateDB.php b/includes/Plugin/UpdateDB.php
index aa569806..8fe9a426 100644
--- a/includes/Plugin/UpdateDB.php
+++ b/includes/Plugin/UpdateDB.php
@@ -59,7 +59,7 @@ public function __construct() {
 	 */
 	public function add_admin_menu() {
 		add_submenu_page(
-			null,
+			' ',
 			'Reepay update db',
 			'Reepay update db',
 			self::USER_CAPABILITY,
diff --git a/includes/Tokens/ReepayTokens.php b/includes/Tokens/ReepayTokens.php
index c72a471f..1de9c746 100644
--- a/includes/Tokens/ReepayTokens.php
+++ b/includes/Tokens/ReepayTokens.php
@@ -99,7 +99,7 @@ public static function save_card_info_to_order( WC_Order $order, $card_info ) {
 			$card_info       = reepay()->api( 'tokens' )->get_reepay_cards( $customer_handle, $card_info );
 
 			if ( is_wp_error( $card_info ) ) {
-				throw new Exception( __( 'Card not found', 'reepay-checkout-gateway' ) );
+				throw new Exception( esc_html__( 'Card not found', 'reepay-checkout-gateway' ) );
 			}
 		}
 
@@ -160,7 +160,7 @@ public static function add_payment_token_to_customer( int $customer_id, $card_in
 		}
 
 		if ( is_wp_error( $card_info ) || empty( $card_info ) ) {
-			throw new Exception( __( 'Card not found', 'reepay-checkout-gateway' ) );
+			throw new Exception( esc_html__( 'Card not found', 'reepay-checkout-gateway' ) );
 		}
 
 		if ( 'ms_' === substr( $card_info['id'], 0, 3 ) ) {
diff --git a/includes/Tokens/TokenReepay.php b/includes/Tokens/TokenReepay.php
index 1b08315b..7be575ae 100644
--- a/includes/Tokens/TokenReepay.php
+++ b/includes/Tokens/TokenReepay.php
@@ -192,7 +192,7 @@ public static function wc_get_account_saved_payment_methods_list_item( array $it
 		$card_type               = $payment_token->get_card_type();
 		$item['method']['id']    = $payment_token->get_id();
 		$item['method']['last4'] = $payment_token->get_last4();
-		$item['method']['brand'] = ( ! empty( $card_type ) ? ucfirst( $card_type ) : esc_html__( 'Credit card', 'woocommerce' ) );
+		$item['method']['brand'] = ( ! empty( $card_type ) ? ucfirst( $card_type ) : esc_html__( 'Credit card', 'reepay-checkout-gateway' ) );
 
 		$item['expires'] = $payment_token->get_expiry_month() . '/' . substr( $payment_token->get_expiry_year(), - 2 );
 
@@ -229,7 +229,7 @@ public static function wc_account_payment_methods_column_method( array $method )
 		 */
 		if ( ! empty( $method['method']['last4'] ) ) {
 			/* translators: 1: credit card type 2: last 4 digits */
-			printf( __( '%1$s ending in %2$s', 'woocommerce' ), esc_html( wc_get_credit_card_type_label( $method['method']['brand'] ) ), esc_html( $method['method']['last4'] ) );
+			printf( __( '%1$s ending in %2$s', 'reepay-checkout-gateway' ), esc_html( wc_get_credit_card_type_label( $method['method']['brand'] ) ), esc_html( $method['method']['last4'] ) );
 		} elseif ( isset( $method['method']['brand'] ) ) {
 				echo esc_html( wc_get_credit_card_type_label( $method['method']['brand'] ) );
 		} else {
diff --git a/includes/Tokens/TokenReepayMS.php b/includes/Tokens/TokenReepayMS.php
index 58d79313..8b74d647 100644
--- a/includes/Tokens/TokenReepayMS.php
+++ b/includes/Tokens/TokenReepayMS.php
@@ -37,11 +37,11 @@ public function get_display_name( $deprecated = '' ) {
 		<img src="<?php echo esc_url( reepay()->get_setting( 'images_url' ) . 'mobilepay.png' ); ?>" width="46" height="24"/>
 
 		<?php if ( is_checkout() ) : ?>
-			<?php echo '&nbsp;' . $this->get_token(); ?>
+			<?php echo esc_html( '&nbsp;' . $this->get_token() ); ?>
 		<?php else : ?>
 			<?php
 			// translators: %s token.
-			printf( __( 'Billwerk+ Pay - Mobilepay Subscriptions [%s]', 'reepay-checkout-gateway' ), $this->get_token() );
+			printf( esc_html__( 'Billwerk+ Pay - Mobilepay Subscriptions [%s]', 'reepay-checkout-gateway' ), esc_html( $this->get_token() ) );
 			?>
 		<?php endif; ?>
 
@@ -93,7 +93,7 @@ public static function wc_account_payment_methods_column_method( array $method )
 
 		if ( rp_is_reepay_payment_method( $method['method']['gateway'] ) ) {
 			$token = new TokenReepayMS( $method['method']['id'] );
-			echo $token->get_display_name();
+			echo esc_html( $token->get_display_name() );
 		}
 	}
 }
diff --git a/includes/Tokens/TokenReepayVR.php b/includes/Tokens/TokenReepayVR.php
index 178d3abd..69c80b3a 100644
--- a/includes/Tokens/TokenReepayVR.php
+++ b/includes/Tokens/TokenReepayVR.php
@@ -37,11 +37,11 @@ public function get_display_name( $deprecated = '' ) {
 		<img src="<?php echo esc_url( reepay()->get_setting( 'images_url' ) . 'vipps.png' ); ?>" width="46" height="24"/>
 
 		<?php if ( is_checkout() ) : ?>
-			<?php echo '&nbsp;' . $this->get_token(); ?>
+			<?php echo esc_html( '&nbsp;' . $this->get_token() ); ?>
 		<?php else : ?>
 			<?php
 			// translators: %s token.
-			printf( __( 'Billwerk+ Pay - Vipps MobilePay Recurring [%s]', 'reepay-checkout-gateway' ), $this->get_token() );
+			printf( esc_html__( 'Billwerk+ Pay - Vipps MobilePay Recurring [%s]', 'reepay-checkout-gateway' ), esc_html( $this->get_token() ) );
 			?>
 		<?php endif; ?>
 
@@ -93,7 +93,7 @@ public static function wc_account_payment_methods_column_method( array $method )
 
 		if ( rp_is_reepay_payment_method( $method['method']['gateway'] ) ) {
 			$token = new TokenReepayVR( $method['method']['id'] );
-			echo $token->get_display_name();
+			echo esc_html( $token->get_display_name() );
 		}
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 960b062b..b8b6a6c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "SEE LICENSE IN License.txt",
       "dependencies": {
+        "braces": "^3.0.3",
         "gulp-clean-css": "^4.3.0",
         "gulp-sass": "^5.0.0",
         "yargs": "^17.7.1"
@@ -509,24 +510,14 @@
       }
     },
     "node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/buffer-equal": {
@@ -603,6 +594,55 @@
         "fsevents": "^1.2.7"
       }
     },
+    "node_modules/chokidar/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1358,18 +1398,14 @@
       "optional": true
     },
     "node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/findup-sync": {
@@ -2734,6 +2770,48 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/micromatch/node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -2747,6 +2825,42 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/micromatch/node_modules/is-extendable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
@@ -2780,6 +2894,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -3749,18 +3876,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/sass/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass/node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -3788,18 +3903,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/sass/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass/node_modules/fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@@ -3838,15 +3941,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/sass/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/sass/node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -3859,18 +3953,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/sass/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/semver-greatest-satisfied-range": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
@@ -4581,16 +4663,22 @@
       }
     },
     "node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/to-regex-range/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
       }
     },
     "node_modules/to-regex/node_modules/extend-shallow": {
@@ -5485,21 +5573,11 @@
       }
     },
     "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "buffer-equal": {
@@ -5559,6 +5637,48 @@
         "path-is-absolute": "^1.0.0",
         "readdirp": "^2.2.1",
         "upath": "^1.1.1"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
       }
     },
     "class-utils": {
@@ -6205,15 +6325,11 @@
       "optional": true
     },
     "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "to-regex-range": "^5.0.1"
       }
     },
     "findup-sync": {
@@ -7340,6 +7456,41 @@
         "to-regex": "^3.0.2"
       },
       "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -7350,6 +7501,35 @@
             "is-extendable": "^1.0.1"
           }
         },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
@@ -7373,6 +7553,16 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
           "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
@@ -8142,15 +8332,6 @@
           "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
           "dev": true
         },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
         "chokidar": {
           "version": "3.5.3",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -8167,15 +8348,6 @@
             "readdirp": "~3.6.0"
           }
         },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
         "fsevents": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@@ -8201,12 +8373,6 @@
             "binary-extensions": "^2.0.0"
           }
         },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
         "readdirp": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -8215,15 +8381,6 @@
           "requires": {
             "picomatch": "^2.2.1"
           }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
@@ -8853,13 +9010,18 @@
       }
     },
     "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "^7.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+        }
       }
     },
     "to-through": {
diff --git a/package.json b/package.json
index 49ad3937..291f1b1d 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "main": "gulpfile.js",
   "dependencies": {
+    "braces": "^3.0.3",
     "gulp-clean-css": "^4.3.0",
     "gulp-sass": "^5.0.0",
     "yargs": "^17.7.1"
diff --git a/reepay-woocommerce-payment.php b/reepay-woocommerce-payment.php
index 18e9e6e8..f9092036 100755
--- a/reepay-woocommerce-payment.php
+++ b/reepay-woocommerce-payment.php
@@ -4,11 +4,11 @@
  * Description: Get a plug-n-play payment solution for WooCommerce, that is easy to use, highly secure and is built to maximize the potential of your e-commerce.
  * Author: Billwerk+
  * Author URI: http://billwerk.plus
- * Version: 1.7.10
+ * Version: 1.7.11
  * Text Domain: reepay-checkout-gateway
  * Domain Path: /languages
  * WC requires at least: 3.0.0
- * WC tested up to: 9.1.4
+ * WC tested up to: 9.3.3
  *
  * @package Reepay\Checkout
  */
@@ -74,11 +74,18 @@ private function __construct() {
 
 		add_action( 'plugins_loaded', array( $this, 'include_classes' ), 0 );
 
-		load_plugin_textdomain( 'reepay-checkout-gateway', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+		add_action( 'init', array( $this, 'init' ) );
 
 		add_action( 'rest_api_init', array( $this, 'init_rest_api' ) );
 	}
 
+	/**
+	 * Init
+	 */
+	public function init(){
+		load_plugin_textdomain( 'reepay-checkout-gateway', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+	}
+
 	/**
 	 * Get main class instance.
 	 *
@@ -97,7 +104,7 @@ public static function get_instance(): WC_ReepayCheckout {
 				) . '</pre>';
 			}
 
-			wp_die( $message );
+			wp_die( wp_kses_post( $message ) );
 		}
 
 		$instance_requested = true;
@@ -133,7 +140,7 @@ public function get_setting( string $name ) {
 			}
 
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-			$plugin_data = get_plugin_data( __FILE__ );
+			$plugin_data = get_file_data( __FILE__, array( 'Version' => 'Version' ) );
 
 			$this->settings = array(
 				'plugin_version'             => $plugin_data['Version'],
@@ -183,7 +190,7 @@ public function get_setting( string $name ) {
 				'status_created'             => ! empty( $gateway_settings['status_created'] ) ? $gateway_settings['status_created'] : '',
 				'status_authorized'          => ! empty( $gateway_settings['status_authorized'] ) ? $gateway_settings['status_authorized'] : '',
 				'status_settled'             => ! empty( $gateway_settings['status_settled'] ) ? $gateway_settings['status_settled'] : '',
-				'logo_height'                => ! empty( $gateway_settings['logo_height'] ) ? $gateway_settings['logo_height'] : '',
+				'logo_height'                => ! empty( $gateway_settings['logo_height'] ) ? $gateway_settings['logo_height'] : '20',
 			);
 		}
 
diff --git a/templates/checkout/order-details.php b/templates/checkout/order-details.php
index 879a04be..4d02d021 100644
--- a/templates/checkout/order-details.php
+++ b/templates/checkout/order-details.php
@@ -12,7 +12,7 @@
 <ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 
 	<li class="woocommerce-order-overview__order order">
-		<?php esc_html_e( 'Order number:', 'woocommerce' ); ?>
+		<?php esc_html_e( 'Order number:', 'reepay-checkout-gateway' ); ?>
 		<strong>
 		<?php
 		echo $order->get_order_number(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -21,7 +21,7 @@
 	</li>
 
 	<li class="woocommerce-order-overview__date date">
-		<?php esc_html_e( 'Date:', 'woocommerce' ); ?>
+		<?php esc_html_e( 'Date:', 'reepay-checkout-gateway' ); ?>
 		<strong>
 		<?php
 		echo wc_format_datetime( $order->get_date_created() ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -31,13 +31,13 @@
 
 	<?php if ( is_user_logged_in() && $order->get_user_id() === get_current_user_id() && $order->get_billing_email() ) : ?>
 		<li class="woocommerce-order-overview__email email">
-			<?php esc_html_e( 'Email:', 'woocommerce' ); ?>
+			<?php esc_html_e( 'Email:', 'reepay-checkout-gateway' ); ?>
 			<strong><?php echo $order->get_billing_email(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></strong>
 		</li>
 	<?php endif; ?>
 
 	<li class="woocommerce-order-overview__total total">
-		<?php esc_html_e( 'Total:', 'woocommerce' ); ?>
+		<?php esc_html_e( 'Total:', 'reepay-checkout-gateway' ); ?>
 		<strong>
 		<?php
 		if ( (float) $order->get_total() > 0.00 ) {
@@ -52,7 +52,7 @@
 
 	<?php if ( $order->get_payment_method_title() ) : ?>
 		<li class="woocommerce-order-overview__payment-method method">
-			<?php esc_html_e( 'Payment method:', 'woocommerce' ); ?>
+			<?php esc_html_e( 'Payment method:', 'reepay-checkout-gateway' ); ?>
 			<strong><?php echo wp_kses_post( $order->get_payment_method_title() ); ?></strong>
 		</li>
 	<?php endif; ?>
diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php
index 8ddfd523..1a98e5ed 100644
--- a/templates/checkout/thankyou.php
+++ b/templates/checkout/thankyou.php
@@ -40,14 +40,14 @@
 
 		<div id="order-status-checking">
 			<p>
-				<?php esc_html_e( 'Please wait. We\'re checking the payment status.', 'acqra' ); ?>
+				<?php esc_html_e( 'Please wait. We\'re checking the payment status.', 'reepay-checkout-gateway' ); ?>
 			</p>
 		</div>
 
 		<div id="order-success" style="display: none;">
 			<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received">
 			<?php
-			echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'woocommerce' ), $order ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'reepay-checkout-gateway' ), $order ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			?>
 			</p>
 			<div id="reepay-order-details">
@@ -79,11 +79,11 @@
 			<p class="woocommerce-notice woocommerce-notice--error woocommerce-thankyou-order-failed-actions">
 				<?php if ( ! wcr_cart_only_reepay_subscriptions() ) : ?>
 					<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>"
-						class="button pay"><?php esc_html_e( 'Pay', 'woocommerce' ); ?></a>
+						class="button pay"><?php esc_html_e( 'Pay', 'reepay-checkout-gateway' ); ?></a>
 				<?php endif; ?>
 				<?php if ( is_user_logged_in() ) : ?>
 					<a href="<?php echo esc_url( wc_get_page_permalink( 'myaccount' ) ); ?>"
-						class="button pay"><?php esc_html_e( 'My account', 'woocommerce' ); ?></a>
+						class="button pay"><?php esc_html_e( 'My account', 'reepay-checkout-gateway' ); ?></a>
 				<?php endif; ?>
 			</p>
 		</div>
@@ -106,7 +106,7 @@ class="button pay"><?php esc_html_e( 'My account', 'woocommerce' ); ?></a>
 
 	<?php else : ?>
 
-		<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'woocommerce' ), null ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
+		<p class="woocommerce-notice woocommerce-notice--success woocommerce-thankyou-order-received"><?php echo apply_filters( 'woocommerce_thankyou_order_received_text', esc_html__( 'Thank you. Your order has been received.', 'reepay-checkout-gateway' ), null ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p>
 
 	<?php endif; ?>
 
diff --git a/templates/meta-boxes/customer.php b/templates/meta-boxes/customer.php
index f5f0eefd..1cd44ffd 100644
--- a/templates/meta-boxes/customer.php
+++ b/templates/meta-boxes/customer.php
@@ -11,20 +11,20 @@
 ?>
 <ul class="order_action">
 	<li class="reepay-admin-section-li-header-small">
-		<?php _e( 'Handle', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php _e( 'Handle', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small">
 		<?php echo $args['handle']; ?>
 	</li>
 	<li class="reepay-admin-section-li-header-small">
-		<?php _e( 'Email', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php _e( 'Email', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small">
 		<?php echo $args['email']; ?>
 	</li>
 	<li class="reepay-admin-section-li">
 		<a class="button" href="<?php echo $args['link']; ?>" target="_blank">
-			<?php _e( 'See customer', 'reepay-subscriptions-for-woocommerce' ); ?>
+			<?php _e( 'See customer', 'reepay-checkout-gateway' ); ?>
 		</a>
 	</li>
 </ul>
diff --git a/templates/meta-boxes/invoice.php b/templates/meta-boxes/invoice.php
index e40992d6..db72ef2c 100644
--- a/templates/meta-boxes/invoice.php
+++ b/templates/meta-boxes/invoice.php
@@ -29,27 +29,27 @@
 	<input type="hidden" id="reepay_order_total_settled" value="<?php echo $order_data['settled_amount']; ?>" data-initial-amount="<?php echo rp_make_initial_amount( $order_data['settled_amount'], $order->get_currency() ); ?>" />
 	<input type="hidden" id="reepay_order_total" data-order-total="<?php echo $order->get_total(); ?>" value="<?php echo $order->get_total() . ' ' . get_woocommerce_currency_symbol( $order->get_currency() ); ?>"/>
 	<li class="reepay-admin-section-li-header-small">
-		<?php echo __( 'Invoice handle', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php echo __( 'Invoice handle', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small">
 		<?php echo $order_data['handle']; ?>
 	</li>
 
 	<li class="reepay-admin-section-li-header-small">
-		<?php echo __( 'State', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php echo __( 'State', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small reepay-invoice-status reepay-invoice-status-<?php echo $order_data['state']; ?> ">
 		<?php echo ucfirst( $order_data['state'] ); ?>
 	</li>
 	<?php if ( $order_is_cancelled ) : ?>
 		<li class="reepay-admin-section-li-small">
-			<?php echo esc_html__( 'Order is cancelled', 'reepay-subscriptions-for-woocommerce' ); ?>
+			<?php echo esc_html__( 'Order is cancelled', 'reepay-checkout-gateway' ); ?>
 		</li>
 	<?php endif; ?>
 
 	<?php if ( isset( $order_data['transactions'][0] ) && isset( $order_data['transactions'][0]['card_transaction'] ) ) : ?>
 		<li class="reepay-admin-section-li-header-small">
-			<?php echo esc_html__( 'Payment method', 'reepay-subscriptions-for-woocommerce' ); ?>
+			<?php echo esc_html__( 'Payment method', 'reepay-checkout-gateway' ); ?>
 		</li>
 		<li class="reepay-admin-section-li-small" style="display: flex;  align-items: center;">
 			<?php if ( isset( $card_logo ) ) : ?>
@@ -69,7 +69,7 @@ class="reepay-admin-card-logo"/>
 
 	<li class="reepay-admin-section-li">
 		<span class="reepay-balance__label">
-			<?php echo esc_html__( 'Remaining balance', 'reepay-subscriptions-for-woocommerce' ); ?>:
+			<?php echo esc_html__( 'Remaining balance', 'reepay-checkout-gateway' ); ?>:
 		</span>
 		<span class="reepay-balance__amount">
 			<span class='reepay-balance__currency'>
@@ -80,7 +80,7 @@ class="reepay-admin-card-logo"/>
 	</li>
 	<li class="reepay-admin-section-li">
 		<span class="reepay-balance__label">
-			<?php echo esc_html__( 'Total authorized', 'reepay-subscriptions-for-woocommerce' ); ?>:
+			<?php echo esc_html__( 'Total authorized', 'reepay-checkout-gateway' ); ?>:
 		</span>
 		<span class="reepay-balance__amount">
 			<span class='reepay-balance__currency'>
@@ -92,7 +92,7 @@ class="reepay-admin-card-logo"/>
 
 	<li class="reepay-admin-section-li">
 		<span class="reepay-balance__label">
-			<?php echo esc_html__( 'Total settled', 'reepay-subscriptions-for-woocommerce' ); ?>:
+			<?php echo esc_html__( 'Total settled', 'reepay-checkout-gateway' ); ?>:
 		</span>
 		<span class="reepay-balance__amount">
 			<span class='reepay-balance__currency'>
@@ -103,7 +103,7 @@ class="reepay-admin-card-logo"/>
 	</li>
 	<li class="reepay-admin-section-li">
 		<span class="reepay-balance__label">
-			<?php echo esc_html__( 'Total refunded', 'reepay-subscriptions-for-woocommerce' ); ?>:
+			<?php echo esc_html__( 'Total refunded', 'reepay-checkout-gateway' ); ?>:
 		</span>
 		<span class="reepay-balance__amount">
 			<span class='reepay-balance__currency'>
@@ -115,7 +115,7 @@ class="reepay-admin-card-logo"/>
 
 	<li class="reepay-admin-section-li-small" style="margin-top: 15px;">
 		<a class="button" href="<?php echo $link; ?>" target="_blank">
-			<?php _e( 'See invoice', 'reepay-subscriptions-for-woocommerce' ); ?>
+			<?php _e( 'See invoice', 'reepay-checkout-gateway' ); ?>
 		</a>
 	</li>
 </ul>
diff --git a/templates/meta-boxes/plan.php b/templates/meta-boxes/plan.php
index 94aaa125..61cf3c57 100644
--- a/templates/meta-boxes/plan.php
+++ b/templates/meta-boxes/plan.php
@@ -11,20 +11,20 @@
 ?>
 <ul class="order_action">
 	<li class="reepay-admin-section-li-header-small">
-		<?php _e( 'Handle', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php _e( 'Handle', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small">
 		<?php echo $args['handle']; ?>
 	</li>
 	<li class="reepay-admin-section-li-header-small">
-		<?php _e( 'Plan', 'reepay-subscriptions-for-woocommerce' ); ?>
+		<?php _e( 'Plan', 'reepay-checkout-gateway' ); ?>
 	</li>
 	<li class="reepay-admin-section-li-small">
 		<?php echo $args['plan']; ?>
 	</li>
 	<li class="reepay-admin-section-li">
 		<a class="button" href="<?php echo $args['link']; ?>" target="_blank">
-			<?php _e( 'See subscription', 'reepay-subscriptions-for-woocommerce' ); ?>
+			<?php _e( 'See subscription', 'reepay-checkout-gateway' ); ?>
 		</a>
 	</li>
 </ul>
diff --git a/tests/unit/gatewaysTests/ReepayGatewayTest.php b/tests/unit/gatewaysTests/ReepayGatewayTest.php
index 4a5489b6..7623aaaa 100644
--- a/tests/unit/gatewaysTests/ReepayGatewayTest.php
+++ b/tests/unit/gatewaysTests/ReepayGatewayTest.php
@@ -207,7 +207,7 @@ public function test_refund_payment_with_cancelled_order() {
 
 	public function test_refund_payment_with_impossible_to_cancel_order() {
 		$this->expectException(Exception::class);
-		$this->expectExceptionMessage('Payment can\'t be refunded.');
+		$this->expectExceptionMessage(esc_html('Payment can\'t be refunded.'));
 
 		self::$gateway->refund_payment( $this->order_generator->order() );
 	}
diff --git a/vite/package-lock.json b/vite/package-lock.json
index bcbbc92b..a142eec8 100644
--- a/vite/package-lock.json
+++ b/vite/package-lock.json
@@ -20,16 +20,19 @@
                 "@types/uuid": "^9.0.8",
                 "@uiw/codemirror-theme-github": "^4.22.0",
                 "@uiw/react-codemirror": "^4.22.0",
-                "axios": "^1.6.8",
+                "axios": "^1.7.7",
+                "braces": "^3.0.3",
                 "clsx": "^2.1.1",
                 "immer": "^9.0.21",
                 "localforage": "^1.10.0",
                 "lodash": "^4.17.21",
+                "micromatch": "^4.0.8",
                 "moment": "^2.30.1",
                 "react": "^18.2.0",
                 "react-dom": "^18.2.0",
                 "react-hook-form": "^7.51.4",
                 "react-redux": "^9.1.2",
+                "rollup": "^4.26.0",
                 "rollup-plugin-copy": "^3.5.0",
                 "styled-components": "^6.1.11",
                 "uuid": "^9.0.1",
@@ -50,12 +53,12 @@
                 "eslint-plugin-react": "^7.34.1",
                 "eslint-plugin-react-hooks": "^4.6.0",
                 "eslint-plugin-react-refresh": "^0.4.6",
-                "postcss": "^8.4.38",
+                "postcss": "^8.4.49",
                 "prettier": "^3.2.5",
                 "prettier-plugin-tailwindcss": "^0.5.14",
                 "tailwindcss": "^3.4.3",
                 "typescript": "^5.2.2",
-                "vite": "^5.2.0",
+                "vite": "^5.4.11",
                 "vite-plugin-monaco-editor": "^1.1.0"
             },
             "optionalDependencies": {
@@ -270,13 +273,366 @@
             "version": "0.8.1",
             "license": "MIT"
         },
+        "node_modules/@esbuild/aix-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "aix"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.20.2",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
             "cpu": [
                 "x64"
             ],
             "dev": true,
-            "license": "MIT",
             "optional": true,
             "os": [
                 "win32"
@@ -657,143 +1013,156 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-            "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
+            "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "android"
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-            "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
+            "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "android"
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-            "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
+            "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "darwin"
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-            "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
+            "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "darwin"
             ]
         },
+        "node_modules/@rollup/rollup-freebsd-arm64": {
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
+            "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-x64": {
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
+            "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-            "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
+            "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-            "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
+            "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
-            "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
+            "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
-            "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
+            "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-            "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
+            "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-            "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
+            "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-            "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
+            "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
@@ -812,51 +1181,48 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
-            "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
+            "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-            "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
+            "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "win32"
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-            "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
+            "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "win32"
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.17.2",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
+            "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
-            "license": "MIT",
             "optional": true,
             "os": [
                 "win32"
@@ -983,9 +1349,9 @@
             "peer": true
         },
         "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "dev": true,
-            "license": "MIT"
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
         },
         "node_modules/@types/fs-extra": {
             "version": "8.1.5",
@@ -1677,8 +2043,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.8",
-            "license": "MIT",
+            "version": "1.7.7",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
                 "form-data": "^4.0.0",
@@ -1717,10 +2084,11 @@
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "license": "MIT",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -2323,10 +2691,11 @@
             }
         },
         "node_modules/esbuild": {
-            "version": "0.20.2",
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
             "dev": true,
             "hasInstallScript": true,
-            "license": "MIT",
             "bin": {
                 "esbuild": "bin/esbuild"
             },
@@ -2334,29 +2703,29 @@
                 "node": ">=12"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.20.2",
-                "@esbuild/android-arm": "0.20.2",
-                "@esbuild/android-arm64": "0.20.2",
-                "@esbuild/android-x64": "0.20.2",
-                "@esbuild/darwin-arm64": "0.20.2",
-                "@esbuild/darwin-x64": "0.20.2",
-                "@esbuild/freebsd-arm64": "0.20.2",
-                "@esbuild/freebsd-x64": "0.20.2",
-                "@esbuild/linux-arm": "0.20.2",
-                "@esbuild/linux-arm64": "0.20.2",
-                "@esbuild/linux-ia32": "0.20.2",
-                "@esbuild/linux-loong64": "0.20.2",
-                "@esbuild/linux-mips64el": "0.20.2",
-                "@esbuild/linux-ppc64": "0.20.2",
-                "@esbuild/linux-riscv64": "0.20.2",
-                "@esbuild/linux-s390x": "0.20.2",
-                "@esbuild/linux-x64": "0.20.2",
-                "@esbuild/netbsd-x64": "0.20.2",
-                "@esbuild/openbsd-x64": "0.20.2",
-                "@esbuild/sunos-x64": "0.20.2",
-                "@esbuild/win32-arm64": "0.20.2",
-                "@esbuild/win32-ia32": "0.20.2",
-                "@esbuild/win32-x64": "0.20.2"
+                "@esbuild/aix-ppc64": "0.21.5",
+                "@esbuild/android-arm": "0.21.5",
+                "@esbuild/android-arm64": "0.21.5",
+                "@esbuild/android-x64": "0.21.5",
+                "@esbuild/darwin-arm64": "0.21.5",
+                "@esbuild/darwin-x64": "0.21.5",
+                "@esbuild/freebsd-arm64": "0.21.5",
+                "@esbuild/freebsd-x64": "0.21.5",
+                "@esbuild/linux-arm": "0.21.5",
+                "@esbuild/linux-arm64": "0.21.5",
+                "@esbuild/linux-ia32": "0.21.5",
+                "@esbuild/linux-loong64": "0.21.5",
+                "@esbuild/linux-mips64el": "0.21.5",
+                "@esbuild/linux-ppc64": "0.21.5",
+                "@esbuild/linux-riscv64": "0.21.5",
+                "@esbuild/linux-s390x": "0.21.5",
+                "@esbuild/linux-x64": "0.21.5",
+                "@esbuild/netbsd-x64": "0.21.5",
+                "@esbuild/openbsd-x64": "0.21.5",
+                "@esbuild/sunos-x64": "0.21.5",
+                "@esbuild/win32-arm64": "0.21.5",
+                "@esbuild/win32-ia32": "0.21.5",
+                "@esbuild/win32-x64": "0.21.5"
             }
         },
         "node_modules/escalade": {
@@ -2755,8 +3124,9 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "license": "MIT",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -2883,7 +3253,6 @@
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
             "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-            "dev": true,
             "hasInstallScript": true,
             "optional": true,
             "os": [
@@ -3427,7 +3796,8 @@
         },
         "node_modules/is-number": {
             "version": "7.0.0",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -3807,10 +4177,11 @@
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.5",
-            "license": "MIT",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dependencies": {
-                "braces": "^3.0.2",
+                "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
             },
             "engines": {
@@ -4158,8 +4529,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.0.0",
-            "license": "ISC"
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -4196,7 +4568,10 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.38",
+            "version": "8.4.49",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+            "dev": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -4211,11 +4586,10 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
-            "license": "MIT",
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^1.2.0"
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -4644,11 +5018,11 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.17.2",
-            "dev": true,
-            "license": "MIT",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
+            "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
             "dependencies": {
-                "@types/estree": "1.0.5"
+                "@types/estree": "1.0.6"
             },
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -4658,22 +5032,24 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.17.2",
-                "@rollup/rollup-android-arm64": "4.17.2",
-                "@rollup/rollup-darwin-arm64": "4.17.2",
-                "@rollup/rollup-darwin-x64": "4.17.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.17.2",
-                "@rollup/rollup-linux-arm64-musl": "4.17.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.17.2",
-                "@rollup/rollup-linux-x64-gnu": "4.17.2",
-                "@rollup/rollup-linux-x64-musl": "4.17.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.17.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.17.2",
-                "@rollup/rollup-win32-x64-msvc": "4.17.2",
+                "@rollup/rollup-android-arm-eabi": "4.26.0",
+                "@rollup/rollup-android-arm64": "4.26.0",
+                "@rollup/rollup-darwin-arm64": "4.26.0",
+                "@rollup/rollup-darwin-x64": "4.26.0",
+                "@rollup/rollup-freebsd-arm64": "4.26.0",
+                "@rollup/rollup-freebsd-x64": "4.26.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.26.0",
+                "@rollup/rollup-linux-arm64-musl": "4.26.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.26.0",
+                "@rollup/rollup-linux-x64-gnu": "4.26.0",
+                "@rollup/rollup-linux-x64-musl": "4.26.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.26.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.26.0",
+                "@rollup/rollup-win32-x64-msvc": "4.26.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -4711,13 +5087,12 @@
             }
         },
         "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.17.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
-            "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
+            "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "optional": true,
             "os": [
                 "linux"
@@ -4911,8 +5286,9 @@
             }
         },
         "node_modules/source-map-js": {
-            "version": "1.2.0",
-            "license": "BSD-3-Clause",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -5124,6 +5500,33 @@
                 "react-dom": ">= 16.8.0"
             }
         },
+        "node_modules/styled-components/node_modules/postcss": {
+            "version": "8.4.38",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
         "node_modules/stylis": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz",
@@ -5263,7 +5666,8 @@
         },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -5540,14 +5944,14 @@
             "peer": true
         },
         "node_modules/vite": {
-            "version": "5.2.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",
-            "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
+            "version": "5.4.11",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+            "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
             "dev": true,
             "dependencies": {
-                "esbuild": "^0.20.1",
-                "postcss": "^8.4.38",
-                "rollup": "^4.13.0"
+                "esbuild": "^0.21.3",
+                "postcss": "^8.4.43",
+                "rollup": "^4.20.0"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -5566,6 +5970,7 @@
                 "less": "*",
                 "lightningcss": "^1.21.0",
                 "sass": "*",
+                "sass-embedded": "*",
                 "stylus": "*",
                 "sugarss": "*",
                 "terser": "^5.4.0"
@@ -5583,6 +5988,9 @@
                 "sass": {
                     "optional": true
                 },
+                "sass-embedded": {
+                    "optional": true
+                },
                 "stylus": {
                     "optional": true
                 },
diff --git a/vite/package.json b/vite/package.json
index 4df33978..62646ba5 100644
--- a/vite/package.json
+++ b/vite/package.json
@@ -23,16 +23,19 @@
         "@types/uuid": "^9.0.8",
         "@uiw/codemirror-theme-github": "^4.22.0",
         "@uiw/react-codemirror": "^4.22.0",
-        "axios": "^1.6.8",
+        "axios": "^1.7.7",
+        "braces": "^3.0.3",
         "clsx": "^2.1.1",
         "immer": "^9.0.21",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
+        "micromatch": "^4.0.8",
         "moment": "^2.30.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-hook-form": "^7.51.4",
         "react-redux": "^9.1.2",
+        "rollup": "^4.26.0",
         "rollup-plugin-copy": "^3.5.0",
         "styled-components": "^6.1.11",
         "uuid": "^9.0.1",
@@ -53,12 +56,12 @@
         "eslint-plugin-react": "^7.34.1",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.6",
-        "postcss": "^8.4.38",
+        "postcss": "^8.4.49",
         "prettier": "^3.2.5",
         "prettier-plugin-tailwindcss": "^0.5.14",
         "tailwindcss": "^3.4.3",
         "typescript": "^5.2.2",
-        "vite": "^5.2.0",
+        "vite": "^5.4.11",
         "vite-plugin-monaco-editor": "^1.1.0"
     },
     "optionalDependencies": {