diff --git a/app/src/java/java/co/omise/android/example/CheckoutActivity.java b/app/src/java/java/co/omise/android/example/CheckoutActivity.java
index 7e48d4115..0ecd67116 100644
--- a/app/src/java/java/co/omise/android/example/CheckoutActivity.java
+++ b/app/src/java/java/co/omise/android/example/CheckoutActivity.java
@@ -17,15 +17,23 @@
 import co.omise.android.api.Client;
 import co.omise.android.api.Request;
 import co.omise.android.api.RequestListener;
-import co.omise.android.config.AuthorizingPaymentConfig;
-import co.omise.android.config.ThreeDSConfig;
+import co.omise.android.config.ButtonCustomization;
+import co.omise.android.config.ButtonCustomizationBuilder;
+import co.omise.android.config.ButtonType;
+import co.omise.android.config.LabelCustomization;
+import co.omise.android.config.LabelCustomizationBuilder;
+import co.omise.android.config.TextBoxCustomization;
+import co.omise.android.config.TextBoxCustomizationBuilder;
+import co.omise.android.config.ToolbarCustomization;
+import co.omise.android.config.ToolbarCustomizationBuilder;
 import co.omise.android.config.UiCustomization;
+import co.omise.android.config.UiCustomizationBuilder;
 import co.omise.android.models.Amount;
 import co.omise.android.models.Capability;
 import co.omise.android.models.Source;
 import co.omise.android.models.Token;
-import co.omise.android.ui.AuthorizingPaymentResult;
 import co.omise.android.ui.AuthorizingPaymentActivity;
+import co.omise.android.ui.AuthorizingPaymentResult;
 import co.omise.android.ui.CreditCardActivity;
 import co.omise.android.ui.OmiseActivity;
 import co.omise.android.ui.PaymentCreatorActivity;
@@ -34,6 +42,7 @@
 
 import static co.omise.android.AuthorizingPaymentURLVerifier.EXTRA_AUTHORIZED_URLSTRING;
 import static co.omise.android.AuthorizingPaymentURLVerifier.EXTRA_EXPECTED_RETURN_URLSTRING_PATTERNS;
+import static co.omise.android.ui.AuthorizingPaymentActivity.EXTRA_UI_CUSTOMIZATION;
 
 public class CheckoutActivity extends AppCompatActivity {
 
@@ -61,8 +70,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_checkout);
 
-        initializeAuthoringPaymentConfig();
-
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(R.string.activity_checkout);
@@ -129,66 +136,74 @@ private void payByCreditCard() {
         startActivityForResult(intent, CREDIT_CARD_REQUEST_CODE);
     }
 
-    /**
-     * Here's the sample of initializing 3D Secure 2.
-     * This should be call before start the {@link AuthorizingPaymentActivity}.
-     */
-    private void initializeAuthoringPaymentConfig() {
-        UiCustomization uiCustomization = new UiCustomization.Builder()
-                .labelCustomization(new UiCustomization.LabelCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Regular.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(16)
-                        .headingTextColor("#000000")
-                        .headingTextFontName("fonts/RobotoMono-Bold.ttf")
-                        .headingTextFontSize(20)
-                        .build())
-                .textBoxCustomization(new UiCustomization.TextBoxCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Regular.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(16)
-                        .borderWidth(1)
-                        .cornerRadius(4)
-                        .borderColor("#1A56F0")
-                        .build())
-                .toolbarCustomization(new UiCustomization.ToolbarCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(20)
-                        .backgroundColor("#FFFFFF")
-                        .headerText("Secure Checkout")
-                        .buttonText("Close")
-                        .build())
-                .buttonCustomization(UiCustomization.ButtonType.SUBMIT_BUTTON, new UiCustomization.ButtonCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#FFFFFF")
-                        .textFontSize(20)
-                        .backgroundColor("#1A56F0")
-                        .cornerRadius(4)
-                        .build())
-                .buttonCustomization(UiCustomization.ButtonType.RESEND_BUTTON, new UiCustomization.ButtonCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(20)
-                        .backgroundColor("#FFFFFF")
-                        .cornerRadius(4)
-                        .build())
+    private Unit startAuthoringPaymentActivity(String authorizeUrl, String returnUrl) {
+        LabelCustomization labelCustomization = new LabelCustomizationBuilder()
+                .headingDarkTextColor("#FFFFFF")
+                .headingTextColor("#000000")
+                .headingTextFontName("roboto_mono")
+                .headingTextFontSize(20)
+                .textFontName("roboto_mono")
+                .textColor("#000000")
+                .textFontSize(16)
                 .build();
 
-        ThreeDSConfig threeDSConfig = new ThreeDSConfig.Builder()
-                .uiCustomization(uiCustomization)
-                .timeout(5)
+        TextBoxCustomization textBoxCustomization = new TextBoxCustomizationBuilder()
+                .textFontName("font/roboto_mono_regular.ttf")
+                .textColor("#000000")
+                .textFontSize(16)
+                .borderWidth(1)
+                .cornerRadius(4)
+                .borderColor("#1A56F0")
                 .build();
-        AuthorizingPaymentConfig authPaymentConfig = new AuthorizingPaymentConfig.Builder()
-                .threeDSConfig(threeDSConfig)
+
+        ToolbarCustomization toolbarCustomization = new ToolbarCustomizationBuilder()
+                .textFontName("font/roboto_mono_bold.ttf")
+                .textColor("#000000")
+                .textFontSize(20)
+                .backgroundColor("#FFFFFF")
+                .headerText("Secure Checkout")
+                .buttonText("Close")
+                .darkBackgroundColor("#262626")
+                .darkTextColor("#FFFFFF")
+                .build();
+
+        ButtonCustomization primaryButtonCustomization = new ButtonCustomizationBuilder()
+                .textFontName("font/roboto_mono_bold.ttf")
+                .textFontSize(20)
+                .cornerRadius(4)
+                .textColor("#FFFFFF")
+                .backgroundColor("#1A56F0")
+                .darkTextColor("#FFFFFF")
+                .darkBackgroundColor("#4777F3")
+                .build();
+
+        ButtonCustomization secondaryButtonCustomization = new ButtonCustomizationBuilder()
+                .textFontName("font/roboto_mono_bold.ttf")
+                .textFontSize(20)
+                .cornerRadius(4)
+                .textColor("#1A56F0")
+                .backgroundColor("#FFFFFF")
+                .darkTextColor("#1E1E1E")
+                .darkBackgroundColor("#FFFFFF")
+                .build();
+
+        UiCustomization uiCustomization = new UiCustomizationBuilder()
+                .supportDarkMode(true)
+                .labelCustomization(labelCustomization)
+                .textBoxCustomization(textBoxCustomization)
+                .toolbarCustomization(toolbarCustomization)
+                .buttonCustomization(ButtonType.SUBMIT, primaryButtonCustomization)
+                .buttonCustomization(ButtonType.CONTINUE, primaryButtonCustomization)
+                .buttonCustomization(ButtonType.NEXT, primaryButtonCustomization)
+                .buttonCustomization(ButtonType.OPEN_OOB_APP, primaryButtonCustomization)
+                .buttonCustomization(ButtonType.RESEND, primaryButtonCustomization)
+                .buttonCustomization(ButtonType.CANCEL, secondaryButtonCustomization)
                 .build();
-        AuthorizingPaymentConfig.initialize(authPaymentConfig);
-    }
 
-    private Unit startAuthoringPaymentActivity(String authorizeUrl, String returnUrl) {
         Intent intent = new Intent(this, AuthorizingPaymentActivity.class);
         intent.putExtra(EXTRA_AUTHORIZED_URLSTRING, authorizeUrl);
         intent.putExtra(EXTRA_EXPECTED_RETURN_URLSTRING_PATTERNS, new String[]{returnUrl});
+        intent.putExtra(EXTRA_UI_CUSTOMIZATION, uiCustomization);
         startActivityForResult(intent, CheckoutActivity.AUTHORIZING_PAYMENT_REQUEST_CODE);
         return Unit.INSTANCE;
     }
diff --git a/app/src/kotlin/java/co/omise/android/example/CheckoutActivity.kt b/app/src/kotlin/java/co/omise/android/example/CheckoutActivity.kt
index 1952ed6d1..3a1eaeb11 100644
--- a/app/src/kotlin/java/co/omise/android/example/CheckoutActivity.kt
+++ b/app/src/kotlin/java/co/omise/android/example/CheckoutActivity.kt
@@ -12,14 +12,18 @@ import co.omise.android.AuthorizingPaymentURLVerifier.Companion.EXTRA_AUTHORIZED
 import co.omise.android.AuthorizingPaymentURLVerifier.Companion.EXTRA_EXPECTED_RETURN_URLSTRING_PATTERNS
 import co.omise.android.api.Client
 import co.omise.android.api.RequestListener
-import co.omise.android.config.AuthorizingPaymentConfig
-import co.omise.android.config.ThreeDSConfig
-import co.omise.android.config.UiCustomization
+import co.omise.android.config.ButtonCustomizationBuilder
+import co.omise.android.config.ButtonType
+import co.omise.android.config.LabelCustomizationBuilder
+import co.omise.android.config.TextBoxCustomizationBuilder
+import co.omise.android.config.ToolbarCustomizationBuilder
+import co.omise.android.config.UiCustomizationBuilder
 import co.omise.android.models.Amount
 import co.omise.android.models.Capability
 import co.omise.android.models.Source
 import co.omise.android.models.Token
 import co.omise.android.ui.AuthorizingPaymentActivity
+import co.omise.android.ui.AuthorizingPaymentActivity.Companion.EXTRA_UI_CUSTOMIZATION
 import co.omise.android.ui.AuthorizingPaymentResult
 import co.omise.android.ui.CreditCardActivity
 import co.omise.android.ui.OmiseActivity
@@ -62,15 +66,13 @@ class CheckoutActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_checkout)
 
-        initializeAuthoringPaymentConfig()
-
         supportActionBar?.title = getString(R.string.activity_checkout)
 
         choosePaymentMethodButton.setOnClickListener { choosePaymentMethod() }
         creditCardButton.setOnClickListener { payByCreditCard() }
         authorizeUrlButton.setOnClickListener {
-            AuthorizingPaymentDialog.showAuthorizingPaymentDialog(this) {authorizeUrl, returnUrl ->
-               startAuthoringPaymentActivity(authorizeUrl, returnUrl)
+            AuthorizingPaymentDialog.showAuthorizingPaymentDialog(this) { authorizeUrl, returnUrl ->
+                startAuthoringPaymentActivity(authorizeUrl, returnUrl)
             }
         }
 
@@ -125,70 +127,80 @@ class CheckoutActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Here's the sample of initializing 3D Secure 2.
-     * This should be call before start the [AuthorizingPaymentActivity].
-     */
-    private fun initializeAuthoringPaymentConfig() {
-        val uiCustomization = UiCustomization.Builder()
-                .labelCustomization(UiCustomization.LabelCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Regular.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(16)
-                        .headingTextColor("#000000")
-                        .headingTextFontName("fonts/RobotoMono-Bold.ttf")
-                        .headingTextFontSize(20)
-                        .build())
-                .textBoxCustomization(UiCustomization.TextBoxCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Regular.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(16)
-                        .borderWidth(1)
-                        .cornerRadius(4)
-                        .borderColor("#1A56F0")
-                        .build())
-                .toolbarCustomization(UiCustomization.ToolbarCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(20)
-                        .backgroundColor("#FFFFFF")
-                        .headerText("Secure Checkout")
-                        .buttonText("Close")
-                        .build())
-                .buttonCustomization(UiCustomization.ButtonType.SUBMIT_BUTTON, UiCustomization.ButtonCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#FFFFFF")
-                        .textFontSize(20)
-                        .backgroundColor("#1A56F0")
-                        .cornerRadius(4)
-                        .build())
-                .buttonCustomization(UiCustomization.ButtonType.RESEND_BUTTON, UiCustomization.ButtonCustomization.Builder()
-                        .textFontName("fonts/RobotoMono-Bold.ttf")
-                        .textFontColor("#000000")
-                        .textFontSize(20)
-                        .backgroundColor("#FFFFFF")
-                        .cornerRadius(4)
-                        .build())
-                .build()
-
-        val threeDSConfig = ThreeDSConfig.Builder()
-                .uiCustomization(uiCustomization)
-                .timeout(5)
-                .build()
-        val authPaymentConfig = AuthorizingPaymentConfig.Builder()
-                .threeDSConfig(threeDSConfig)
-                .build()
-        AuthorizingPaymentConfig.initialize(authPaymentConfig)
-    }
-
     private fun startAuthoringPaymentActivity(authorizeUrl: String, returnUrl: String) {
-        Log.d(TAG, """
+        val labelCustomization = LabelCustomizationBuilder()
+            .headingDarkTextColor("#FFFFFF")
+            .headingTextColor("#000000")
+            .headingTextFontName("roboto_mono")
+            .headingTextFontSize(20)
+            .textFontName("roboto_mono")
+            .textColor("#000000")
+            .textFontSize(16)
+            .build()
+
+        val textBoxCustomization = TextBoxCustomizationBuilder()
+            .textFontName("font/roboto_mono_regular.ttf")
+            .textColor("#000000")
+            .textFontSize(16)
+            .borderWidth(1)
+            .cornerRadius(4)
+            .borderColor("#1A56F0")
+            .build()
+
+        val toolbarCustomization = ToolbarCustomizationBuilder()
+            .textFontName("font/roboto_mono_bold.ttf")
+            .textColor("#000000")
+            .textFontSize(20)
+            .backgroundColor("#FFFFFF")
+            .headerText("Secure Checkout")
+            .buttonText("Close")
+            .darkBackgroundColor("#262626")
+            .darkTextColor("#FFFFFF")
+            .build()
+
+        val primaryButtonCustomization = ButtonCustomizationBuilder()
+            .textFontName("font/roboto_mono_bold.ttf")
+            .textFontSize(20)
+            .cornerRadius(4)
+            .textColor("#FFFFFF")
+            .backgroundColor("#1A56F0")
+            .darkTextColor("#FFFFFF")
+            .darkBackgroundColor("#4777F3")
+            .build()
+
+        val secondaryButtonCustomization = ButtonCustomizationBuilder()
+            .textFontName("font/roboto_mono_bold.ttf")
+            .textFontSize(20)
+            .cornerRadius(4)
+            .textColor("#1A56F0")
+            .backgroundColor("#FFFFFF")
+            .darkTextColor("#1E1E1E")
+            .darkBackgroundColor("#FFFFFF")
+            .build()
+
+        val uiCustomization = UiCustomizationBuilder()
+            .supportDarkMode(true)
+            .labelCustomization(labelCustomization)
+            .textBoxCustomization(textBoxCustomization)
+            .toolbarCustomization(toolbarCustomization)
+            .buttonCustomization(ButtonType.SUBMIT, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.CONTINUE, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.NEXT, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.OPEN_OOB_APP, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.RESEND, secondaryButtonCustomization)
+            .buttonCustomization(ButtonType.CANCEL, secondaryButtonCustomization)
+            .build()
+
+        Log.d(
+            TAG, """
             authorizeUrl=$authorizeUrl
             returnUrl=$returnUrl
-        """.trimIndent())
+        """.trimIndent()
+        )
         Intent(this, AuthorizingPaymentActivity::class.java).run {
             putExtra(EXTRA_AUTHORIZED_URLSTRING, authorizeUrl)
             putExtra(EXTRA_EXPECTED_RETURN_URLSTRING_PATTERNS, arrayOf(returnUrl))
+            putExtra(EXTRA_UI_CUSTOMIZATION, uiCustomization)
             startActivityForResult(this, AUTHORIZING_PAYMENT_REQUEST_CODE)
         }
     }
@@ -234,12 +246,14 @@ class CheckoutActivity : AppCompatActivity() {
                             Log.e(TAG, throwable.message, throwable.cause)
                             throwable.message ?: "Unknown error."
                         }
+
                         null -> "Not found the authorization result."
                     }
                     Log.d(TAG, resultMessage)
                     snackbar.setText(resultMessage).show()
                 }
             }
+
             PAYMENT_CREATOR_REQUEST_CODE -> {
                 if (data.hasExtra(OmiseActivity.EXTRA_SOURCE_OBJECT)) {
                     val source = data.getParcelableExtra<Source>(OmiseActivity.EXTRA_SOURCE_OBJECT)
@@ -251,11 +265,13 @@ class CheckoutActivity : AppCompatActivity() {
                     Log.d(TAG, "token: ${token?.id}")
                 }
             }
+
             CREDIT_CARD_REQUEST_CODE -> {
                 val token = data.getParcelableExtra<Token>(OmiseActivity.EXTRA_TOKEN_OBJECT)
                 snackbar.setText(token?.id ?: "No token object.").show()
                 Log.d(TAG, "token: ${token?.id}")
             }
+
             else -> {
                 super.onActivityResult(requestCode, resultCode, data)
             }
diff --git a/app/src/main/res/font/roboto_mono.xml b/app/src/main/res/font/roboto_mono.xml
new file mode 100644
index 000000000..c0ed8904e
--- /dev/null
+++ b/app/src/main/res/font/roboto_mono.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/roboto_mono_regular"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/roboto_mono_bold"
+        app:fontStyle="normal"
+        app:fontWeight="700" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/assets/fonts/RobotoMono-Bold.ttf b/app/src/main/res/font/roboto_mono_bold.ttf
similarity index 100%
rename from app/src/main/assets/fonts/RobotoMono-Bold.ttf
rename to app/src/main/res/font/roboto_mono_bold.ttf
diff --git a/app/src/main/assets/fonts/RobotoMono-Regular.ttf b/app/src/main/res/font/roboto_mono_regular.ttf
similarity index 100%
rename from app/src/main/assets/fonts/RobotoMono-Regular.ttf
rename to app/src/main/res/font/roboto_mono_regular.ttf
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e1b7a3e82..7b3913f47 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="materialButtonStyle">@style/SampleButton</item>
         <item name="editTextLabelStyle">@style/SampleEditTextLabel</item>
         <item name="editTextErrorStyle">@style/SampleEditTextError</item>
+        <item name="fontFamily">@font/roboto_mono</item>
     </style>
 
     <style name="SampleTextView" parent="Widget.AppCompat.TextView">
diff --git a/sdk/src/androidTest/java/co/omise/android/ui/AuthorizingPaymentActivityTest.kt b/sdk/src/androidTest/java/co/omise/android/ui/AuthorizingPaymentActivityTest.kt
index 23a8dd861..7601dec5c 100644
--- a/sdk/src/androidTest/java/co/omise/android/ui/AuthorizingPaymentActivityTest.kt
+++ b/sdk/src/androidTest/java/co/omise/android/ui/AuthorizingPaymentActivityTest.kt
@@ -5,7 +5,6 @@ import android.app.Instrumentation
 import android.content.Intent
 import android.net.Uri
 import androidx.arch.core.executor.testing.CountingTaskExecutorRule
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -60,7 +59,6 @@ import org.mockito.Mockito.any
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
-import org.mockito.kotlin.doNothing
 import org.mockito.kotlin.whenever
 import java.util.concurrent.TimeUnit
 
@@ -107,7 +105,6 @@ class AuthorizingPaymentActivityTest {
         whenever(mockViewModel.transactionStatus).thenReturn(transactionStatus)
         whenever(mockViewModel.getTransaction()).thenReturn(transaction)
         whenever(transaction.getProgressView(any())).thenReturn(progressView)
-        doNothing().whenever(mockViewModel).cleanup()
 
         interceptActivityLifecycle { activity, _ ->
             (activity as? AuthorizingPaymentActivity)?.setViewModelFactory(viewModelFactory)
diff --git a/sdk/src/main/java/co/omise/android/ThreeDS2ServiceWrapper.kt b/sdk/src/main/java/co/omise/android/ThreeDS2ServiceWrapper.kt
index 538cad906..38b0a48b7 100644
--- a/sdk/src/main/java/co/omise/android/ThreeDS2ServiceWrapper.kt
+++ b/sdk/src/main/java/co/omise/android/ThreeDS2ServiceWrapper.kt
@@ -18,7 +18,11 @@ import kotlin.coroutines.suspendCoroutine
 /**
  * Encapsulates the [ThreeDS2Service] to allow for easier testing.
  */
-internal class ThreeDS2ServiceWrapper(private val context: Context, private val threeDS2Service: ThreeDS2Service) {
+internal class ThreeDS2ServiceWrapper(
+    private val context: Context,
+    private val threeDS2Service: ThreeDS2Service,
+    private val uiCustomization: UiCustomization,
+) {
     lateinit var transaction: Transaction
         private set
 
@@ -37,7 +41,6 @@ internal class ThreeDS2ServiceWrapper(private val context: Context, private val
                 .configureScheme(schemeConfig)
                 .build()
             val locale = getLocale()
-            val uiCustomization = UiCustomization()
             threeDS2Service.initialize(context, configParameters, locale, uiCustomization)
             continuation.resume(Result.success(Unit))
         } catch (e: Exception) {
diff --git a/sdk/src/main/java/co/omise/android/config/ThreeDSConfig.kt b/sdk/src/main/java/co/omise/android/config/ThreeDSConfig.kt
index 9f23fa61e..1665941d4 100644
--- a/sdk/src/main/java/co/omise/android/config/ThreeDSConfig.kt
+++ b/sdk/src/main/java/co/omise/android/config/ThreeDSConfig.kt
@@ -55,7 +55,8 @@ class ThreeDSConfig private constructor(internal val threeDSConfig: co.omise.and
          * @return [ThreeDSConfig]
          */
         fun build(): ThreeDSConfig {
-            return ThreeDSConfig(co.omise.android.threeds.core.ThreeDSConfig(uiCustomization.uiCustomization, timeout))
+            TODO("The below is not compatible with Netcetera's 3DS SDK.")
+            // return ThreeDSConfig(co.omise.android.threeds.core.ThreeDSConfig(uiCustomization.uiCustomization, timeout))
         }
     }
 }
diff --git a/sdk/src/main/java/co/omise/android/config/UiCustomization.kt b/sdk/src/main/java/co/omise/android/config/UiCustomization.kt
index a3d99b5ea..669943c65 100644
--- a/sdk/src/main/java/co/omise/android/config/UiCustomization.kt
+++ b/sdk/src/main/java/co/omise/android/config/UiCustomization.kt
@@ -1,389 +1,485 @@
 package co.omise.android.config
 
-import androidx.annotation.StyleRes
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
 
 
+abstract class CustomizationBuilder<T> {
+    protected var textFontSize: Int? = null
+    protected var textColor: String? = null
+    protected var textFontName: String? = null
+    protected var darkTextColor: String? = null
+    abstract fun build(): T
+}
+
 /**
- * Configuration for UI customization in the challenge flow.
+ * Configuration for UI customization.
  */
-data class UiCustomization internal constructor(internal val uiCustomization: co.omise.android.threeds.customization.UiCustomization) {
+@Parcelize
+data class UiCustomization internal constructor(
+    internal val uiCustomization: com.netcetera.threeds.sdk.api.ui.logic.UiCustomization
+) : Parcelable {
     companion object {
-        val default = UiCustomization(co.omise.android.threeds.customization.UiCustomization(
-                labelCustomization = co.omise.android.threeds.customization.LabelCustomization(),
-                toolbarCustomization = co.omise.android.threeds.customization.ToolbarCustomization(),
-                buttonCustomizations = emptyMap(),
-                textBoxCustomization = co.omise.android.threeds.customization.TextBoxCustomization()
-        ))
+        val default = UiCustomization(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization())
     }
+}
 
-    class Builder {
-        private var uiCustomization: UiCustomization = default
-        private var buttonCustomizations: MutableMap<ButtonType, ButtonCustomization> = mutableMapOf()
-
-        /**
-         * Set the label customization.
-         *
-         * @param labelCustomization Label customization data.
-         */
-        fun labelCustomization(labelCustomization: LabelCustomization): Builder = apply {
-            uiCustomization = uiCustomization.copy(
-                    uiCustomization = uiCustomization.uiCustomization.copy(
-                            labelCustomization = labelCustomization.labelCustomization
-                    )
-            )
-        }
+/**
+ * Builder for building [UiCustomization] data.
+ */
+class UiCustomizationBuilder {
+    private var supportDarkMode: Boolean? = null
+    private var labelCustomization: LabelCustomization? = null
+    private var toolbarCustomization: ToolbarCustomization? = null
+    private var textBoxCustomization: TextBoxCustomization? = null
+    private var buttonCustomizations: MutableMap<ButtonType, ButtonCustomization> = mutableMapOf()
 
-        /**
-         * Set the text box customization.
-         *
-         * @param textBoxCustomization Text box customization data.
-         */
-        fun textBoxCustomization(textBoxCustomization: TextBoxCustomization): Builder = apply {
-            uiCustomization = uiCustomization.copy(
-                    uiCustomization = uiCustomization.uiCustomization.copy(
-                            textBoxCustomization = textBoxCustomization.textBoxCustomization
-                    )
-            )
-        }
+    /**
+     * Set whether the UI should support dark mode.
+     *
+     * @param supportDarkMode True if the UI should support dark mode, false otherwise.
+     */
+    fun supportDarkMode(supportDarkMode: Boolean): UiCustomizationBuilder = apply {
+        this@UiCustomizationBuilder.supportDarkMode = supportDarkMode
+    }
 
-        /**
-         * Set the toolbar customization.
-         *
-         * @param toolbarCustomization Toolbar customization data.
-         */
-        fun toolbarCustomization(toolbarCustomization: ToolbarCustomization): Builder = apply {
-            uiCustomization = uiCustomization.copy(
-                    uiCustomization = uiCustomization.uiCustomization.copy(
-                            toolbarCustomization = toolbarCustomization.toolbarCustomization
-                    )
-            )
-        }
+    /**
+     * Set the label customization.
+     *
+     * @param labelCustomization [LabelCustomization] data.
+     */
+    fun labelCustomization(labelCustomization: LabelCustomization): UiCustomizationBuilder = apply {
+        this@UiCustomizationBuilder.labelCustomization = labelCustomization
+    }
 
-        /**
-         * Set the button customization for the particular button.
-         *
-         * @param buttonType Type of button.
-         * @param buttonCustomization Button customization data.
-         */
-        fun buttonCustomization(buttonType: ButtonType, buttonCustomization: ButtonCustomization): Builder = apply {
-            buttonCustomizations[buttonType] = buttonCustomization
-            uiCustomization = uiCustomization.copy(
-                    uiCustomization = uiCustomization.uiCustomization.copy(
-                            buttonCustomizations = buttonCustomizations.map { co.omise.android.threeds.customization.ButtonType.buttonTypeOf(it.key.value) to it.value.buttonCustomization }.toMap()
-                    )
-            )
-        }
+    /**
+     * Set the text box customization.
+     *
+     * @param textBoxCustomization [TextBoxCustomization] data.
+     */
+    fun textBoxCustomization(textBoxCustomization: TextBoxCustomization): UiCustomizationBuilder = apply {
+        this@UiCustomizationBuilder.textBoxCustomization = textBoxCustomization
+    }
 
-        /**
-         * Set the theme resource to override the default theme. The theme resource will not override the EditText and Button
-         * because they are custom widgets. However you can you [TextBoxCustomization] and [ButtonCustomization] to customize those elements.
-         *
-         * @param theme Theme resource.
-         */
-        fun theme(@StyleRes theme: Int): Builder = apply {
-            uiCustomization = uiCustomization.copy(
-                    uiCustomization = uiCustomization.uiCustomization.copy(
-                            theme = theme
-                    )
-            )
-        }
-        /**
-         * Create an instance of [UiCustomization].
-         *
-         * @return [UiCustomization]
-         */
-        fun build(): UiCustomization {
-            return UiCustomization(uiCustomization.uiCustomization)
-        }
+    /**
+     * Set the toolbar customization.
+     *
+     * @param toolbarCustomization [ToolbarCustomization] data.
+     */
+    fun toolbarCustomization(toolbarCustomization: ToolbarCustomization): UiCustomizationBuilder = apply {
+        this@UiCustomizationBuilder.toolbarCustomization = toolbarCustomization
     }
 
     /**
-     * Configuration for label customization.
+     * Set the button customization for the particular button.
+     *
+     * @param buttonType [ButtonType] type of button.
+     * @param buttonCustomization [ButtonCustomization] data.
      */
-    data class LabelCustomization internal constructor(internal val labelCustomization: co.omise.android.threeds.customization.LabelCustomization) {
-        class Builder {
-            private var labelCustomization = co.omise.android.threeds.customization.LabelCustomization()
+    fun buttonCustomization(buttonType: ButtonType, buttonCustomization: ButtonCustomization): UiCustomizationBuilder = apply {
+        this@UiCustomizationBuilder.buttonCustomizations[buttonType] = buttonCustomization
+    }
 
-            /**
-             * Set the text font for texts.
-             *
-             * @param fontName Font path in the assets directory.
-             */
-            fun textFontName(fontName: String): Builder = apply {
-                labelCustomization = labelCustomization.copy(textFontName = fontName)
-            }
 
-            /**
-             * Set the text color for texts.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun textFontColor(hexColor: String): Builder = apply {
-                labelCustomization = labelCustomization.copy(textFontColor = hexColor)
+    /**
+     * Create an instance of [UiCustomization].
+     *
+     * @return [UiCustomization]
+     */
+    fun build(): UiCustomization {
+        val uiCustomization = com.netcetera.threeds.sdk.api.ui.logic.UiCustomization().apply {
+            this@UiCustomizationBuilder.supportDarkMode?.let { this.supportDarkMode(it) }
+            this@UiCustomizationBuilder.labelCustomization?.let { this.labelCustomization = it.labelCustomization }
+            this@UiCustomizationBuilder.toolbarCustomization?.let { this.toolbarCustomization = it.toolbarCustomization }
+            this@UiCustomizationBuilder.textBoxCustomization?.let { this.textBoxCustomization = it.textBoxCustomization }
+            this@UiCustomizationBuilder.buttonCustomizations.forEach { (buttonType, buttonCustomization) ->
+                this.setButtonCustomization(buttonCustomization.buttonCustomization, buttonType.value)
             }
+        }
+        return UiCustomization(uiCustomization)
+    }
+}
 
-            /**
-             * Set the text size for texts.
-             *
-             * @param fontSize Font size in scalable pixels (sp).
-             */
-            fun textFontSize(fontSize: Int): Builder = apply {
-                labelCustomization = labelCustomization.copy(textFontSize = fontSize)
-            }
+/**
+ * Configuration for label customization.
+ */
+@Parcelize
+data class LabelCustomization internal constructor(
+    internal val labelCustomization: com.netcetera.threeds.sdk.api.ui.logic.LabelCustomization
+) : Parcelable
 
-            /**
-             * Set the text color for headers.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun headingTextColor(hexColor: String): Builder = apply {
-                labelCustomization = labelCustomization.copy(headingTextColor = hexColor)
-            }
+/**
+ * Builder for building [LabelCustomization] data.
+ */
+class LabelCustomizationBuilder : CustomizationBuilder<LabelCustomization>() {
+    private var headingTextColor: String? = null
+    private var headingTextFontName: String? = null
+    private var headingTextFontSize: Int? = null
+    private var headingDarkTextColor: String? = null
 
-            /**
-             * Set the text font for headers.
-             *
-             * @param fontName Font path in the assets directory.
-             */
-            fun headingTextFontName(fontName: String): Builder = apply {
-                labelCustomization = labelCustomization.copy(headingTextFontName = fontName)
-            }
+    /**
+     * Set the heading text color.
+     *
+     * @param headingTextColor Color in hex format.
+     */
+    fun headingTextColor(headingTextColor: String): LabelCustomizationBuilder = apply { this.headingTextColor = headingTextColor }
 
-            /**
-             * Set the text size for headers.
-             *
-             * @param fontSize Font size in scalable pixels (sp).
-             */
-            fun headingTextFontSize(fontSize: Int): Builder = apply {
-                labelCustomization = labelCustomization.copy(headingTextFontSize = fontSize)
-            }
+    /**
+     * Set the heading text font name.
+     *
+     * @param headingTextFontName Font name.
+     */
+    fun headingTextFontName(headingTextFontName: String): LabelCustomizationBuilder =
+        apply { this.headingTextFontName = headingTextFontName }
+
+    /**
+     * Set the heading text font size.
+     *
+     * @param headingTextFontSize Font size in sp unit.
+     */
+    fun headingTextFontSize(headingTextFontSize: Int): LabelCustomizationBuilder =
+        apply { this.headingTextFontSize = headingTextFontSize }
+
+    /**
+     * Set the heading dark text color.
+     *
+     * @param headingDarkTextColor Color in hex format.
+     */
+    fun headingDarkTextColor(headingDarkTextColor: String): LabelCustomizationBuilder =
+        apply { this.headingDarkTextColor = headingDarkTextColor }
+
+    /**
+     * Set the text color.
+     *
+     * @param textColor Color in hex format.
+     */
+    fun textColor(textColor: String): LabelCustomizationBuilder = apply { this.textColor = textColor }
+
+    /**
+     * Set the text font size.
+     *
+     * @param textFontSize Font size in sp unit.
+     */
+    fun textFontSize(textFontSize: Int): LabelCustomizationBuilder = apply { this.textFontSize = textFontSize }
+
+    /**
+     * Set the text font name.
+     *
+     * @param textFontName Font name.
+     */
+    fun textFontName(textFontName: String): LabelCustomizationBuilder = apply { this.textFontName = textFontName }
+
+    /**
+     * Set the dark text color.
+     *
+     * @param darkTextColor Color in hex format.
+     */
+    fun darkTextColor(darkTextColor: String): LabelCustomizationBuilder = apply { this.darkTextColor = darkTextColor }
 
-            /**
-             * Create an instance of [LabelCustomization].
-             *
-             * @return [LabelCustomization]
-             */
-            fun build(): LabelCustomization {
-                return LabelCustomization(labelCustomization)
+    /**
+     * Create an instance of [LabelCustomization].
+     *
+     * @return [LabelCustomization]
+     */
+    override fun build(): LabelCustomization {
+        return LabelCustomization(
+            com.netcetera.threeds.sdk.api.ui.logic.LabelCustomization().apply {
+                this@LabelCustomizationBuilder.headingTextColor?.let { this.headingTextColor = it }
+                this@LabelCustomizationBuilder.headingTextFontName?.let { this.headingTextFontName = it }
+                this@LabelCustomizationBuilder.headingTextFontSize?.let { this.headingTextFontSize = it }
+                this@LabelCustomizationBuilder.headingDarkTextColor?.let { this.headingDarkTextColor = it }
+                this@LabelCustomizationBuilder.textColor?.let { this.textColor = it }
+                this@LabelCustomizationBuilder.textFontSize?.let { this.textFontSize = it }
+                this@LabelCustomizationBuilder.textFontName?.let { this.textFontName = it }
+                this@LabelCustomizationBuilder.darkTextColor?.let { this.darkTextColor = it }
             }
-        }
+        )
     }
+}
+
+/**
+ * Configuration for Text box customization.
+ */
+@Parcelize
+data class TextBoxCustomization internal constructor(
+    internal val textBoxCustomization: com.netcetera.threeds.sdk.api.ui.logic.TextBoxCustomization
+) : Parcelable
+
+/**
+ * Builder for building [TextBoxCustomization] data.
+ */
+class TextBoxCustomizationBuilder : CustomizationBuilder<TextBoxCustomization>() {
+    private var borderWidth: Int? = null
+    private var borderColor: String? = null
+    private var cornerRadius: Int? = null
+    private var darkBorderColor: String? = null
 
     /**
-     * Configuration for Text box customization.
+     * Set the border width.
+     *
+     * @param borderWidth Border width in dp unit.
      */
-    data class TextBoxCustomization internal constructor(internal val textBoxCustomization: co.omise.android.threeds.customization.TextBoxCustomization) {
-        class Builder {
-            private var textBoxCustomization = co.omise.android.threeds.customization.TextBoxCustomization()
+    fun borderWidth(borderWidth: Int): TextBoxCustomizationBuilder = apply { this.borderWidth = borderWidth }
 
-            /**
-             * Set the text font for the text box.
-             *
-             * @param fontName Font path in the assets directory.
-             */
-            fun textFontName(fontName: String): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(textFontName = fontName)
-            }
+    /**
+     * Set the border color.
+     *
+     * @param borderColor Color in hex format.
+     */
+    fun borderColor(borderColor: String): TextBoxCustomizationBuilder = apply { this.borderColor = borderColor }
 
-            /**
-             * Set the text color for the text box.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun textFontColor(hexColor: String): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(textFontColor = hexColor)
-            }
+    /**
+     * Set the corner radius.
+     *
+     * @param cornerRadius Corner radius in dp unit.
+     */
+    fun cornerRadius(cornerRadius: Int): TextBoxCustomizationBuilder = apply { this.cornerRadius = cornerRadius }
 
-            /**
-             * Set the text size for the text box.
-             *
-             * @param fontSize Font size in scalable pixels (sp).
-             */
-            fun textFontSize(fontSize: Int): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(textFontSize = fontSize)
-            }
+    /**
+     * Set the dark border color.
+     *
+     * @param darkBorderColor Color in hex format.
+     */
+    fun darkBorderColor(darkBorderColor: String): TextBoxCustomizationBuilder = apply { this.darkBorderColor = darkBorderColor }
 
-            /**
-             * Set the border width for the text box.
-             *
-             * @param  borderWidth Border width in density-independent pixels (dp).
-             */
-            fun borderWidth(borderWidth: Int): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(borderWidth = borderWidth)
-            }
+    /**
+     * Set the text color.
+     *
+     * @param textColor Color in hex format.
+     */
+    fun textColor(textColor: String): TextBoxCustomizationBuilder = apply { this.textColor = textColor }
 
-            /**
-             * Set the border color for the text box.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun borderColor(hexColor: String): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(borderColor = hexColor)
-            }
+    /**
+     * Set the text font size.
+     *
+     * @param textFontSize Font size in sp unit.
+     */
+    fun textFontSize(textFontSize: Int): TextBoxCustomizationBuilder = apply { this.textFontSize = textFontSize }
 
-            /**
-             * Set the corner radius for the text box.
-             *
-             * @param  cornerRadius Corner radius in density-independent pixels (dp).
-             */
-            fun cornerRadius(cornerRadius: Int): Builder = apply {
-                textBoxCustomization = textBoxCustomization.copy(cornerRadius = cornerRadius)
-            }
+    /**
+     * Set the text font name.
+     *
+     * @param textFontName Font name.
+     */
+    fun textFontName(textFontName: String): TextBoxCustomizationBuilder = apply { this.textFontName = textFontName }
 
-            /**
-             * Create an instance of [TextBoxCustomization].
-             *
-             * @return [TextBoxCustomization]
-             */
-            fun build(): TextBoxCustomization {
-                return TextBoxCustomization(textBoxCustomization)
+    /**
+     * Set the dark text color.
+     *
+     * @param darkTextColor Color in hex format.
+     */
+    fun darkTextColor(darkTextColor: String): TextBoxCustomizationBuilder = apply { this.darkTextColor = darkTextColor }
+
+    /**
+     * Create an instance of [TextBoxCustomization].
+     *
+     * @return [TextBoxCustomization]
+     */
+    override fun build(): TextBoxCustomization {
+        return TextBoxCustomization(
+            com.netcetera.threeds.sdk.api.ui.logic.TextBoxCustomization().apply {
+                this@TextBoxCustomizationBuilder.borderWidth?.let { this.borderWidth = it }
+                this@TextBoxCustomizationBuilder.borderColor?.let { this.borderColor = it }
+                this@TextBoxCustomizationBuilder.cornerRadius?.let { this.cornerRadius = it }
+                this@TextBoxCustomizationBuilder.darkBorderColor?.let { this.darkBorderColor = it }
+                this@TextBoxCustomizationBuilder.textColor?.let { this.textColor = it }
+                this@TextBoxCustomizationBuilder.textFontSize?.let { this.textFontSize = it }
+                this@TextBoxCustomizationBuilder.textFontName?.let { this.textFontName = it }
+                this@TextBoxCustomizationBuilder.darkTextColor?.let { this.darkTextColor = it }
             }
-        }
+        )
     }
+}
+
+/**
+ * Configuration for Toolbar customization.
+ */
+@Parcelize
+data class ToolbarCustomization internal constructor(
+    internal val toolbarCustomization: com.netcetera.threeds.sdk.api.ui.logic.ToolbarCustomization
+) : Parcelable
+
+/**
+ * Builder for building [ToolbarCustomization] data.
+ */
+class ToolbarCustomizationBuilder : CustomizationBuilder<ToolbarCustomization>() {
+    private var headerText: String? = null
+    private var buttonText: String? = null
+    private var backgroundColor: String? = null
+    private var darkBackgroundColor: String? = null
 
     /**
-     * Configuration for Toolbar customization.
+     * Set the heading text.
+     *
+     * @param headerText Heading text.
      */
-    data class ToolbarCustomization internal constructor(internal val toolbarCustomization: co.omise.android.threeds.customization.ToolbarCustomization) {
-        class Builder {
-            private var toolbarCustomization = co.omise.android.threeds.customization.ToolbarCustomization()
+    fun headerText(headerText: String): ToolbarCustomizationBuilder = apply { this.headerText = headerText }
 
-            /**
-             * Set the text font for the toolbar's title and cancel button.
-             *
-             * @param fontName Font path in the assets directory.
-             */
-            fun textFontName(fontName: String): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(textFontName = fontName)
-            }
+    /**
+     * Set the button text.
+     *
+     * @param buttonText Button text.
+     */
+    fun buttonText(buttonText: String): ToolbarCustomizationBuilder = apply { this.buttonText = buttonText }
 
-            /**
-             * Set the text color for the toolbar's title and cancel button.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun textFontColor(hexColor: String): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(textFontColor = hexColor)
-            }
+    /**
+     * Set the background color.
+     *
+     * @param backgroundColor Color in hex format.
+     */
+    fun backgroundColor(backgroundColor: String): ToolbarCustomizationBuilder = apply { this.backgroundColor = backgroundColor }
 
-            /**
-             * Set the text size for the toolbar's title.
-             *
-             * @param fontSize Font size in scalable pixels (sp).
-             */
-            fun textFontSize(fontSize: Int): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(textFontSize = fontSize)
-            }
+    /**
+     * Set the dark background color.
+     *
+     * @param darkBackgroundColor Color in hex format.
+     */
+    fun darkBackgroundColor(darkBackgroundColor: String): ToolbarCustomizationBuilder =
+        apply { this.darkBackgroundColor = darkBackgroundColor }
 
-            /**
-             * Set the color for the toolbar's background.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun backgroundColor(hexColor: String): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(backgroundColor = hexColor)
-            }
+    /**
+     * Set the text color.
+     *
+     * @param textColor Color in hex format.
+     */
+    fun textColor(textColor: String): ToolbarCustomizationBuilder = apply { this.textColor = textColor }
 
-            /**
-             * Set the title text for toolbar's title.
-             *
-             * @param text Toolbar title's text.
-             */
-            fun headerText(text: String): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(headerText = text)
-            }
+    /**
+     * Set the text font size.
+     *
+     * @param textFontSize Font size in sp unit.
+     */
+    fun textFontSize(textFontSize: Int): ToolbarCustomizationBuilder = apply { this.textFontSize = textFontSize }
 
-            /**
-             * Set the text for toolbar's cancel button.
-             *
-             * @param text Cancel button's text.
-             */
-            fun buttonText(text: String): Builder = apply {
-                toolbarCustomization = toolbarCustomization.copy(buttonText = text)
-            }
+    /**
+     * Set the text font name.
+     *
+     * @param textFontName Font name.
+     */
+    fun textFontName(textFontName: String): ToolbarCustomizationBuilder = apply { this.textFontName = textFontName }
+
+    /**
+     * Set the dark text color.
+     *
+     * @param darkTextColor Color in hex format.
+     */
+    fun darkTextColor(darkTextColor: String): ToolbarCustomizationBuilder = apply { this.darkTextColor = darkTextColor }
 
-            /**
-             * Create an instance of [ToolbarCustomization].
-             *
-             * @return [ToolbarCustomization]
-             */
-            fun build(): ToolbarCustomization {
-                return ToolbarCustomization(toolbarCustomization)
+    /**
+     * Create an instance of [ToolbarCustomization].
+     *
+     * @return [ToolbarCustomization]
+     */
+    override fun build(): ToolbarCustomization {
+        return ToolbarCustomization(
+            com.netcetera.threeds.sdk.api.ui.logic.ToolbarCustomization().apply {
+                this@ToolbarCustomizationBuilder.headerText?.let { this.headerText = it }
+                this@ToolbarCustomizationBuilder.buttonText?.let { this.buttonText = it }
+                this@ToolbarCustomizationBuilder.backgroundColor?.let { this.backgroundColor = it }
+                this@ToolbarCustomizationBuilder.darkBackgroundColor?.let { this.darkBackgroundColor = it }
+                this@ToolbarCustomizationBuilder.textColor?.let { this.textColor = it }
+                this@ToolbarCustomizationBuilder.textFontSize?.let { this.textFontSize = it }
+                this@ToolbarCustomizationBuilder.textFontName?.let { this.textFontName = it }
+                this@ToolbarCustomizationBuilder.darkTextColor?.let { this.darkTextColor = it }
             }
-        }
+        )
     }
+}
+
+/**
+ * Type of button in the challenge screen.
+ */
+enum class ButtonType(val value: com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType) {
+    SUBMIT(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.SUBMIT),
+    CONTINUE(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.CONTINUE),
+    NEXT(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.NEXT),
+    CANCEL(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.CANCEL),
+    RESEND(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.RESEND),
+    OPEN_OOB_APP(com.netcetera.threeds.sdk.api.ui.logic.UiCustomization.ButtonType.OPEN_OOB_APP)
+}
+
+/**
+ * Configuration for button customization.
+ */
+@Parcelize
+data class ButtonCustomization internal constructor(
+    internal val buttonCustomization: com.netcetera.threeds.sdk.api.ui.logic.ButtonCustomization
+) : Parcelable
+
+/**
+ * Builder for building [ButtonCustomization] data.
+ */
+class ButtonCustomizationBuilder : CustomizationBuilder<ButtonCustomization>() {
+    private var cornerRadius: Int? = null
+    private var backgroundColor: String? = null
+    private var darkBackgroundColor: String? = null
 
     /**
-     * Type of button in the challenge flow.
+     * Set the corner radius.
+     *
+     * @param cornerRadius Corner radius in dp unit.
      */
-    enum class ButtonType(val value: String) {
-        SUBMIT_BUTTON("SUBMIT"),
-        CONTINUE_BUTTON("CONTINUE"),
-        NEXT_BUTTON("NEXT"),
-        CANCEL_BUTTON("CANCEL"),
-        RESEND_BUTTON("RESEND")
-    }
+    fun cornerRadius(cornerRadius: Int): ButtonCustomizationBuilder = apply { this.cornerRadius = cornerRadius }
 
     /**
-     * Configuration for button customization.
+     * Set the background color.
+     *
+     * @param backgroundColor Color in hex format.
      */
-    data class ButtonCustomization internal constructor(internal val buttonCustomization: co.omise.android.threeds.customization.ButtonCustomization) {
-        class Builder {
-            private var buttonCustomization = co.omise.android.threeds.customization.ButtonCustomization()
+    fun backgroundColor(backgroundColor: String): ButtonCustomizationBuilder = apply { this.backgroundColor = backgroundColor }
 
-            /**
-             * Set the text font for the toolbar's title and cancel button.
-             *
-             * @param fontName Font path in the assets directory.
-             */
-            fun textFontName(fontName: String): Builder = apply {
-                buttonCustomization = buttonCustomization.copy(textFontName = fontName)
-            }
+    /**
+     * Set the dark background color.
+     *
+     * @param darkBackgroundColor Color in hex format.
+     */
+    fun darkBackgroundColor(darkBackgroundColor: String): ButtonCustomizationBuilder =
+        apply { this.darkBackgroundColor = darkBackgroundColor }
 
-            /**
-             * Set the color for the button text's color.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun textFontColor(hexColor: String): Builder = apply {
-                buttonCustomization = buttonCustomization.copy(textFontColor = hexColor)
-            }
+    /**
+     * Set the text color.
+     *
+     * @param textColor Color in hex format.
+     */
+    fun textColor(textColor: String): ButtonCustomizationBuilder = apply { this.textColor = textColor }
 
-            /**
-             * Set the text size for the button's text.
-             *
-             * @param fontSize Font size in scalable pixels (sp).
-             */
-            fun textFontSize(fontSize: Int): Builder = apply {
-                buttonCustomization = buttonCustomization.copy(textFontSize = fontSize)
-            }
+    /**
+     * Set the text font size.
+     *
+     * @param textFontSize Font size in sp unit.
+     */
+    fun textFontSize(textFontSize: Int): ButtonCustomizationBuilder = apply { this.textFontSize = textFontSize }
 
-            /**
-             * Set the color for the button's background.
-             *
-             * @param hexColor Color in hex format e.g. #FFFFFF
-             */
-            fun backgroundColor(hexColor: String): Builder = apply {
-                buttonCustomization = buttonCustomization.copy(backgroundColor = hexColor)
-            }
+    /**
+     * Set the text font name.
+     *
+     * @param textFontName Font name.
+     */
+    fun textFontName(textFontName: String): ButtonCustomizationBuilder = apply { this.textFontName = textFontName }
 
-            /**
-             * Set the corner radius for the button.
-             *
-             * @param  cornerRadius Corner radius in density-independent pixels (dp).
-             */
-            fun cornerRadius(cornerRadius: Int): Builder = apply {
-                buttonCustomization = buttonCustomization.copy(cornerRadius = cornerRadius)
-            }
+    /**
+     * Set the dark text color.
+     *
+     * @param darkTextColor Color in hex format.
+     */
+    fun darkTextColor(darkTextColor: String): ButtonCustomizationBuilder = apply { this.darkTextColor = darkTextColor }
 
-            /**
-             * Create an instance of [ButtonCustomization].
-             *
-             * @return [ButtonCustomization].
-             */
-            fun build(): ButtonCustomization {
-                return ButtonCustomization(buttonCustomization)
+    /**
+     * Create an instance of [ButtonCustomization].
+     *
+     * @return [ButtonCustomization]
+     */
+    override fun build(): ButtonCustomization {
+        return ButtonCustomization(
+            com.netcetera.threeds.sdk.api.ui.logic.ButtonCustomization().apply {
+                this@ButtonCustomizationBuilder.cornerRadius?.let { this.cornerRadius = it }
+                this@ButtonCustomizationBuilder.backgroundColor?.let { this.backgroundColor = it }
+                this@ButtonCustomizationBuilder.darkBackgroundColor?.let { this.darkBackgroundColor = it }
+                this@ButtonCustomizationBuilder.textColor?.let { this.textColor = it }
+                this@ButtonCustomizationBuilder.textFontSize?.let { this.textFontSize = it }
+                this@ButtonCustomizationBuilder.textFontName?.let { this.textFontName = it }
+                this@ButtonCustomizationBuilder.darkTextColor?.let { this.darkTextColor = it }
             }
-        }
+        )
     }
 }
diff --git a/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentActivity.kt b/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentActivity.kt
index f999b1428..46829b7aa 100644
--- a/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentActivity.kt
+++ b/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentActivity.kt
@@ -23,11 +23,8 @@ import co.omise.android.AuthorizingPaymentURLVerifier.Companion.EXTRA_RETURNED_U
 import co.omise.android.AuthorizingPaymentURLVerifier.Companion.REQUEST_EXTERNAL_CODE
 import co.omise.android.OmiseException
 import co.omise.android.R
-import co.omise.android.config.AuthorizingPaymentConfig
+import co.omise.android.config.UiCustomization
 import co.omise.android.models.Authentication
-import co.omise.android.threeds.challenge.ProgressView
-import co.omise.android.threeds.core.ThreeDSConfig
-import co.omise.android.threeds.events.CompletionEvent
 import co.omise.android.ui.AuthorizingPaymentResult.Failure
 import co.omise.android.ui.AuthorizingPaymentResult.ThreeDS1Completed
 import co.omise.android.ui.AuthorizingPaymentResult.ThreeDS2Completed
@@ -42,24 +39,24 @@ import org.jetbrains.annotations.TestOnly
  */
 class AuthorizingPaymentActivity : AppCompatActivity() {
 
-    private val progressDialog: ProgressView by lazy { ProgressView.newInstance(this) }
     private val webView: WebView by lazy { authorizing_payment_webview }
     private val verifier: AuthorizingPaymentURLVerifier by lazy { AuthorizingPaymentURLVerifier(intent) }
+    private val uiCustomization: UiCustomization by lazy { intent.getParcelableExtra(EXTRA_UI_CUSTOMIZATION) ?: UiCustomization.default }
 
     private val viewModel: AuthorizingPaymentViewModel by viewModels {
         viewModelFactory ?: AuthorizingPaymentViewModelFactory(
-            this,
-            verifier
+            activity = this,
+            urlVerifier = verifier,
+            uiCustomization = uiCustomization,
         )
     }
     private var viewModelFactory: ViewModelProvider.Factory? = null
-    private val threeDSConfig: ThreeDSConfig by lazy { AuthorizingPaymentConfig.get().threeDSConfig.threeDSConfig }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_authorizing_payment)
 
-        supportActionBar?.title = threeDSConfig.uiCustomization?.toolbarCustomization?.headerText
+        supportActionBar?.title = uiCustomization.uiCustomization.toolbarCustomization?.headerText
             ?: getString(R.string.title_authorizing_payment)
 
         if (verifier.verifyExternalURL(verifier.authorizedURL)) {
@@ -258,5 +255,11 @@ class AuthorizingPaymentActivity : AppCompatActivity() {
          * [AuthorizingPaymentResult] intent result from [AuthorizingPaymentActivity].
          */
         const val EXTRA_AUTHORIZING_PAYMENT_RESULT = "OmiseActivity.authorizingPaymentResult"
+
+        /**
+         * [co.omise.android.config.UiCustomization] intent extra for [AuthorizingPaymentActivity] to configure the UI in the challenge flow.
+         * This is an optional parameter. If not provided, the default UI will be used.
+         */
+        const val EXTRA_UI_CUSTOMIZATION = "OmiseActivity.uiCustomization"
     }
 }
diff --git a/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentViewModel.kt b/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentViewModel.kt
index 5907f5c70..af688bc77 100644
--- a/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentViewModel.kt
+++ b/sdk/src/main/java/co/omise/android/ui/AuthorizingPaymentViewModel.kt
@@ -11,11 +11,9 @@ import co.omise.android.BuildConfig
 import co.omise.android.OmiseException
 import co.omise.android.ThreeDS2ServiceWrapper
 import co.omise.android.api.Client
-import co.omise.android.config.AuthorizingPaymentConfig
+import co.omise.android.config.UiCustomization
 import co.omise.android.models.Authentication
 import co.omise.android.models.Serializer
-import co.omise.android.threeds.ThreeDS
-import co.omise.android.threeds.core.ThreeDSConfig
 import com.netcetera.threeds.sdk.ThreeDS2ServiceInstance
 import com.netcetera.threeds.sdk.api.transaction.Transaction
 import com.netcetera.threeds.sdk.api.transaction.challenge.ChallengeParameters
@@ -23,27 +21,26 @@ import com.netcetera.threeds.sdk.api.transaction.challenge.ChallengeStatusReceiv
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 
 
 internal class AuthorizingPaymentViewModelFactory(
     private val activity: Activity,
-    private val urlVerifier
-    : AuthorizingPaymentURLVerifier
+    private val urlVerifier: AuthorizingPaymentURLVerifier,
+    private val uiCustomization: UiCustomization,
 ) : ViewModelProvider.Factory {
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-        // TODO: Remove this after replacing with Netcetera's 3DS SDK.
-        ThreeDSConfig.initialize(AuthorizingPaymentConfig.get().threeDSConfig.threeDSConfig)
-        val threeDS = ThreeDS(activity)
         val client = Client("")
-        val wrapper = ThreeDS2ServiceWrapper(activity.application, ThreeDS2ServiceInstance.get())
-        return AuthorizingPaymentViewModel(threeDS, client, urlVerifier, wrapper) as T
+        val wrapper = ThreeDS2ServiceWrapper(
+            context = activity.application,
+            threeDS2Service = ThreeDS2ServiceInstance.get(),
+            uiCustomization = uiCustomization.uiCustomization,
+        )
+        return AuthorizingPaymentViewModel(client, urlVerifier, wrapper) as T
     }
 }
 
 internal class AuthorizingPaymentViewModel(
-    private val threeDS: ThreeDS,
     private val client: Client,
     private val urlVerifier: AuthorizingPaymentURLVerifier,
     private val threeDS2Service: ThreeDS2ServiceWrapper,
@@ -124,7 +121,7 @@ internal class AuthorizingPaymentViewModel(
             _isLoading.postValue(true)
             val authentication = client.send(request)
 
-            // Reccomended by Netcetera's 3DS SDK.
+            // Recommended by Netcetera's 3DS SDK.
             // If the challenge flow is required
             // - Do not close the transaction
             // - Do not hide the progress view
@@ -164,12 +161,6 @@ internal class AuthorizingPaymentViewModel(
         return threeDS2Service.transaction
     }
 
-    // TODO: Remove this after removing Omise's 3DS SDK.
-    fun cleanup() {
-        viewModelScope.cancel()
-        threeDS.cleanup()
-    }
-
     /** [ChallengeStatusReceiver] implementation. */
     override fun completed(event: com.netcetera.threeds.sdk.api.transaction.challenge.events.CompletionEvent?) {
         when (event?.transactionStatus) {
diff --git a/sdk/src/test/java/co/omise/android/config/UiCustomizationTest.kt b/sdk/src/test/java/co/omise/android/config/UiCustomizationTest.kt
new file mode 100644
index 000000000..da3c35852
--- /dev/null
+++ b/sdk/src/test/java/co/omise/android/config/UiCustomizationTest.kt
@@ -0,0 +1,153 @@
+package co.omise.android.config
+
+import com.netcetera.threeds.sdk.api.ui.logic.UiCustomization
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+
+@RunWith(RobolectricTestRunner::class)
+class UiCustomizationTest {
+    @Test
+    fun uiCustomization_shouldBeAbleToCreateInstanceWithBuilder() {
+        val toolbarCustomization = ToolbarCustomizationBuilder().build()
+        val labelCustomization = LabelCustomizationBuilder().build()
+        val textBoxCustomization = TextBoxCustomizationBuilder().build()
+        val primaryButtonCustomization = ButtonCustomizationBuilder().build()
+        val secondaryButtonCustomization = ButtonCustomizationBuilder().build()
+
+        val uiCustomization = UiCustomizationBuilder()
+            .supportDarkMode(true)
+            .toolbarCustomization(toolbarCustomization)
+            .labelCustomization(labelCustomization)
+            .textBoxCustomization(textBoxCustomization)
+            .buttonCustomization(ButtonType.SUBMIT, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.CONTINUE, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.NEXT, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.OPEN_OOB_APP, primaryButtonCustomization)
+            .buttonCustomization(ButtonType.CANCEL, secondaryButtonCustomization)
+            .buttonCustomization(ButtonType.RESEND, secondaryButtonCustomization)
+            .build()
+
+        assertTrue(uiCustomization.uiCustomization.darkModeSupported)
+        assertEquals(toolbarCustomization.toolbarCustomization, uiCustomization.uiCustomization.toolbarCustomization)
+        assertEquals(labelCustomization.labelCustomization, uiCustomization.uiCustomization.labelCustomization)
+        assertEquals(textBoxCustomization.textBoxCustomization, uiCustomization.uiCustomization.textBoxCustomization)
+        assertEquals(
+            primaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.SUBMIT)
+        )
+        assertEquals(
+            primaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.CONTINUE)
+        )
+        assertEquals(
+            primaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.NEXT)
+        )
+        assertEquals(
+            primaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.OPEN_OOB_APP)
+        )
+        assertEquals(
+            secondaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.CANCEL)
+        )
+        assertEquals(
+            secondaryButtonCustomization.buttonCustomization,
+            uiCustomization.uiCustomization.getButtonCustomization(UiCustomization.ButtonType.RESEND)
+        )
+    }
+
+    @Test
+    fun labelCustomization_shouldBeAbleToCreateInstanceWithBuilder() {
+        val labelCustomization = LabelCustomizationBuilder()
+            .headingTextFontSize(18)
+            .headingTextFontName("Roboto-Bold")
+            .headingTextColor("#000000")
+            .headingDarkTextColor("#FFFFFF")
+            .textFontSize(16)
+            .textFontName("Roboto")
+            .textColor("#000000")
+            .darkTextColor("#FFFFFF")
+            .build()
+
+        assertEquals(18, labelCustomization.labelCustomization.headingTextFontSize)
+        assertEquals("Roboto-Bold", labelCustomization.labelCustomization.headingTextFontName)
+        assertEquals("#000000", labelCustomization.labelCustomization.headingTextColor)
+        assertEquals("#FFFFFF", labelCustomization.labelCustomization.headingDarkTextColor)
+        assertEquals(16, labelCustomization.labelCustomization.textFontSize)
+        assertEquals("Roboto", labelCustomization.labelCustomization.textFontName)
+        assertEquals("#000000", labelCustomization.labelCustomization.textColor)
+        assertEquals("#FFFFFF", labelCustomization.labelCustomization.darkTextColor)
+    }
+
+    @Test
+    fun textBoxCustomization_shouldBeAbleToCreateInstanceWithBuilder() {
+        val textBoxCustomization = TextBoxCustomizationBuilder()
+            .borderWidth(1)
+            .borderColor("#1A56F0")
+            .cornerRadius(4)
+            .darkBorderColor("#1A56F0")
+            .textFontSize(16)
+            .textFontName("Roboto")
+            .textColor("#000000")
+            .darkTextColor("#FFFFFF")
+            .build()
+
+        assertEquals(1, textBoxCustomization.textBoxCustomization.borderWidth)
+        assertEquals("#1A56F0", textBoxCustomization.textBoxCustomization.borderColor)
+        assertEquals(4, textBoxCustomization.textBoxCustomization.cornerRadius)
+        assertEquals("#1A56F0", textBoxCustomization.textBoxCustomization.darkBorderColor)
+        assertEquals(16, textBoxCustomization.textBoxCustomization.textFontSize)
+        assertEquals("Roboto", textBoxCustomization.textBoxCustomization.textFontName)
+        assertEquals("#000000", textBoxCustomization.textBoxCustomization.textColor)
+        assertEquals("#FFFFFF", textBoxCustomization.textBoxCustomization.darkTextColor)
+    }
+
+    @Test
+    fun toolbarCustomization_shouldBeAbleToCreateInstanceWithBuilder() {
+        val toolbarCustomization = ToolbarCustomizationBuilder()
+            .headerText("Secure Checkout")
+            .buttonText("Close")
+            .backgroundColor("#FFFFFF")
+            .darkBackgroundColor("#000000")
+            .textFontSize(20)
+            .textFontName("Roboto")
+            .textColor("#000000")
+            .darkTextColor("#FFFFFF")
+            .build()
+
+        assertEquals("Secure Checkout", toolbarCustomization.toolbarCustomization.headerText)
+        assertEquals("Close", toolbarCustomization.toolbarCustomization.buttonText)
+        assertEquals("#FFFFFF", toolbarCustomization.toolbarCustomization.backgroundColor)
+        assertEquals("#000000", toolbarCustomization.toolbarCustomization.darkBackgroundColor)
+        assertEquals(20, toolbarCustomization.toolbarCustomization.textFontSize)
+        assertEquals("Roboto", toolbarCustomization.toolbarCustomization.textFontName)
+        assertEquals("#000000", toolbarCustomization.toolbarCustomization.textColor)
+        assertEquals("#FFFFFF", toolbarCustomization.toolbarCustomization.darkTextColor)
+    }
+
+    @Test
+    fun buttonCustomization_shouldBeAbleToCreateInstanceWithBuilder() {
+        val buttonCustomization = ButtonCustomizationBuilder()
+            .cornerRadius(4)
+            .backgroundColor("#1A56F0")
+            .darkBackgroundColor("#1A56F0")
+            .textFontSize(16)
+            .textFontName("Roboto")
+            .textColor("#000000")
+            .darkTextColor("#FFFFFF")
+            .build()
+
+        assertEquals(4, buttonCustomization.buttonCustomization.cornerRadius)
+        assertEquals("#1A56F0", buttonCustomization.buttonCustomization.backgroundColor)
+        assertEquals("#1A56F0", buttonCustomization.buttonCustomization.darkBackgroundColor)
+        assertEquals(16, buttonCustomization.buttonCustomization.textFontSize)
+        assertEquals("Roboto", buttonCustomization.buttonCustomization.textFontName)
+        assertEquals("#000000", buttonCustomization.buttonCustomization.textColor)
+        assertEquals("#FFFFFF", buttonCustomization.buttonCustomization.darkTextColor)
+    }
+}
diff --git a/sdk/src/test/java/co/omise/android/ui/AuthorizingPaymentViewModelTest.kt b/sdk/src/test/java/co/omise/android/ui/AuthorizingPaymentViewModelTest.kt
index 02be6709b..eed77d332 100644
--- a/sdk/src/test/java/co/omise/android/ui/AuthorizingPaymentViewModelTest.kt
+++ b/sdk/src/test/java/co/omise/android/ui/AuthorizingPaymentViewModelTest.kt
@@ -9,7 +9,6 @@ import co.omise.android.api.Request
 import co.omise.android.models.Authentication
 import co.omise.android.models.Authentication.AuthenticationStatus
 import co.omise.android.models.AuthenticationAPIError
-import co.omise.android.threeds.ThreeDS
 import com.netcetera.threeds.sdk.api.exceptions.InvalidInputException
 import com.netcetera.threeds.sdk.api.exceptions.SDKRuntimeException
 import com.netcetera.threeds.sdk.api.transaction.AuthenticationRequestParameters
@@ -43,7 +42,6 @@ class AuthorizingPaymentViewModelTest {
     @get:Rule
     val instanceExecutor = InstantTaskExecutorRule()
 
-    private val threeDS: ThreeDS = mock()
     private val client: Client = mock()
     private val urlVerifier: AuthorizingPaymentURLVerifier = mock()
     private val threeDS2Service: ThreeDS2ServiceWrapper = mock()
@@ -74,7 +72,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun initialize3DS_shouldInitialize3DS2ServiceAndSendAuthenticationRequest() = runTest {
-        AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(threeDS2Service).initialize()
         verify(client).send(any<Request<Authentication>>())
@@ -85,7 +83,7 @@ class AuthorizingPaymentViewModelTest {
         threeDS2Service.stub {
             onBlocking { initialize() } doReturn Result.failure(InvalidInputException("Something went wrong."))
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(threeDS2Service).initialize()
         verify(client, never()).send(any<Request<Authentication>>())
@@ -99,7 +97,7 @@ class AuthorizingPaymentViewModelTest {
                 status = AuthenticationStatus.SUCCESS
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(client).send(any<Request<Authentication>>())
         verify(transaction).close()
@@ -113,7 +111,7 @@ class AuthorizingPaymentViewModelTest {
                 status = AuthenticationStatus.CHALLENGE
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(client).send(any<Request<Authentication>>())
         verify(transaction, never()).close()
@@ -128,7 +126,7 @@ class AuthorizingPaymentViewModelTest {
                 status = AuthenticationStatus.CHALLENGE_V1
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(client).send(any<Request<Authentication>>())
         verify(transaction).close()
@@ -142,7 +140,7 @@ class AuthorizingPaymentViewModelTest {
                 status = AuthenticationStatus.FAILED
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(client).send(any<Request<Authentication>>())
         verify(transaction).close()
@@ -157,7 +155,7 @@ class AuthorizingPaymentViewModelTest {
                 message = "Something went wrong."
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         verify(client).send(any<Request<Authentication>>())
         verify(transaction).close()
@@ -178,7 +176,7 @@ class AuthorizingPaymentViewModelTest {
                 )
             )
         }
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.doChallenge(mock())
 
@@ -200,7 +198,7 @@ class AuthorizingPaymentViewModelTest {
             )
         }
         whenever(threeDS2Service.doChallenge(any(), any(), any(), any())).doThrow(SDKRuntimeException("Something went wrong.", null))
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.doChallenge(mock())
 
@@ -210,7 +208,7 @@ class AuthorizingPaymentViewModelTest {
     @Test
     fun completed_whenReceivedTransactionStatusYThenSetAuthenticatedStatus() {
         val completionEvent = CompletionEvent(UUID.randomUUID().toString(), "Y")
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.completed(completionEvent)
 
@@ -219,7 +217,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun completed_whenReceivedTransactionStatusNThenSetNotAuthenticatedStatus() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.completed(CompletionEvent(UUID.randomUUID().toString(), "N"))
 
@@ -228,7 +226,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun completed_whenReceivedUnknownTransactionStatusThenSetError() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.completed(CompletionEvent(UUID.randomUUID().toString(), "unknown"))
 
@@ -237,7 +235,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun cancelled_whenReceivedCancelledEventThenSetError() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.cancelled()
 
@@ -246,7 +244,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun timedout_whenReceivedTimedoutEventThenSetError() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.timedout()
 
@@ -255,7 +253,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun protocolError_whenReceivedProtocolErrorEventThenSetError() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.protocolError(
             ProtocolErrorEvent(
@@ -276,7 +274,7 @@ class AuthorizingPaymentViewModelTest {
 
     @Test
     fun runtimeError_whenReceivedRuntimeErrorEventThenSetError() {
-        val viewModel = AuthorizingPaymentViewModel(threeDS, client, urlVerifier, threeDS2Service, testDispatcher)
+        val viewModel = AuthorizingPaymentViewModel(client, urlVerifier, threeDS2Service, testDispatcher)
 
         viewModel.runtimeError(
             RuntimeErrorEvent(