diff --git a/src/Template/Basic.php b/src/Template/Basic.php
index f95e486..bb722f2 100644
--- a/src/Template/Basic.php
+++ b/src/Template/Basic.php
@@ -133,7 +133,7 @@ function getHeaders(token) {
 				    }
 				};
 				
-				widget.options.theme = {
+				widget.setOptionsChunk({theme: {
 				    components: {
 				        BulkGateSignInView: {
 				            defaultProps: {
@@ -153,9 +153,9 @@ function getHeaders(token) {
 				            }
 				        }
 				    }
-				};
+				}});
 				
-				widget.options.layout = {
+				widget.setOptionsChunk({layout: {
 				    appBar: {
 				        showLogOut: false,
 				        logoUrl: "images/white-label/bulkgate/logo/logo-title.svg",
@@ -164,7 +164,7 @@ function getHeaders(token) {
 				            width: "192px",
 				        }
 				    }
-				};
+				}});
 				
 				widget.options.proxy = function (reducerName, requestData) {
 				    let proxyData = {$escape_js($proxy)};
diff --git a/src/Template/SendMessage.php b/src/Template/SendMessage.php
index 3c1c304..640bd4e 100644
--- a/src/Template/SendMessage.php
+++ b/src/Template/SendMessage.php
@@ -63,8 +63,10 @@ public static function print(Container $di, $order, array $props = []): void
         }
 
 		wp_print_inline_script_tag(<<<JS
-			function init_widget_message_send(widget) { widget.options.SendMessageProps = {$escape_js((object)$props)}; }
-		JS);
+            function init_widget_message_send(widget) {
+                widget.setOptionsChunk({props: {$escape_js((object)$props)}});
+            }
+        JS);
 
 		$jwt = $di->getByClass(Sign::class)->authenticate();