diff --git a/app/build.gradle b/app/build.gradle
index 26b1be9d..8fcf95c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        manifestPlaceholders = [auth0Domain: "@string/com_auth0_domain", auth0Scheme: "@string/com_auth0_scheme"]
+//        manifestPlaceholders = [auth0Domain: "@string/com_auth0_domain", auth0Scheme: "@string/com_auth0_scheme"]
     }
 
     signingConfigs {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d03953be..5eb3f07e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,17 +77,19 @@
                     android:scheme="androidacsapp" />
             </intent-filter>
 
-            <!--<intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:scheme="demo" />
-            </intent-filter>-->
+                    android:host="*.auth0.com"
+                    android:scheme="demo"
+                    android:path="/android/com.alfresco.content.app.debug/callback"/>
+            </intent-filter>
 
-            <intent-filter>
+            <!--<intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -96,7 +98,7 @@
                 <data
                     android:host="callback"
                     android:scheme="alfrescomobile" />
-            </intent-filter>
+            </intent-filter>-->
         </activity>
         <activity
             android:name="com.alfresco.content.browse.preview.LocalPreviewActivity"
diff --git a/app/src/main/java/com/alfresco/content/app/activity/LoginActivity.kt b/app/src/main/java/com/alfresco/content/app/activity/LoginActivity.kt
index 2e9d3518..b6a122e3 100644
--- a/app/src/main/java/com/alfresco/content/app/activity/LoginActivity.kt
+++ b/app/src/main/java/com/alfresco/content/app/activity/LoginActivity.kt
@@ -64,8 +64,6 @@ class LoginActivity : com.alfresco.auth.activity.LoginActivity() {
                 person.displayName ?: "",
                 person.email,
                 myFiles,
-                credentials.hostName,
-                credentials.clientId,
             )
         } else {
             val current = Account.getAccount(applicationContext)
@@ -82,8 +80,6 @@ class LoginActivity : com.alfresco.auth.activity.LoginActivity() {
                 person.displayName ?: "",
                 person.email,
                 myFiles,
-                credentials.hostName,
-                credentials.clientId,
             )
         }
     }
@@ -103,4 +99,4 @@ class LoginActivity : com.alfresco.auth.activity.LoginActivity() {
         startActivity(i)
         finish()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alfresco/content/app/fragment/SettingsFragment.kt b/app/src/main/java/com/alfresco/content/app/fragment/SettingsFragment.kt
index fd61e21e..89ab5ef3 100644
--- a/app/src/main/java/com/alfresco/content/app/fragment/SettingsFragment.kt
+++ b/app/src/main/java/com/alfresco/content/app/fragment/SettingsFragment.kt
@@ -90,8 +90,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private fun logout() {
         val acc = SessionManager.requireSession.account
         val i = Intent(context, LogoutActivity::class.java)
-        i.putExtra(LogoutViewModel.EXTRA_HOST_NAME, acc.hostName)
-        i.putExtra(LogoutViewModel.EXTRA_CLIENT_ID, acc.clientId)
         i.putExtra(LogoutViewModel.EXTRA_AUTH_TYPE, acc.authType)
         i.putExtra(LogoutViewModel.EXTRA_AUTH_CONFIG, acc.authConfig)
         i.putExtra(LogoutViewModel.EXTRA_AUTH_STATE, acc.authState)
@@ -114,4 +112,4 @@ class SettingsFragment : PreferenceFragmentCompat() {
             activity.finish()
         }
     }
-}
+}
\ No newline at end of file
diff --git a/auth/src/main/kotlin/com/alfresco/auth/activity/LoginActivity.kt b/auth/src/main/kotlin/com/alfresco/auth/activity/LoginActivity.kt
index eeb60ac0..ff13fc84 100644
--- a/auth/src/main/kotlin/com/alfresco/auth/activity/LoginActivity.kt
+++ b/auth/src/main/kotlin/com/alfresco/auth/activity/LoginActivity.kt
@@ -99,7 +99,11 @@ abstract class LoginActivity : AuthenticationActivity<LoginViewModel>() {
             LoginViewModel.Step.InputIdentityServer -> InputIdentityFragment.with(this).display()
             LoginViewModel.Step.InputAppServer -> InputServerFragment.with(this).display()
             LoginViewModel.Step.EnterBasicCredentials -> BasicAuthFragment.with(this).display()
-            LoginViewModel.Step.EnterPkceCredentials, LoginViewModel.Step.EnterAuth0Credentials -> viewModel.ssoLogin()
+            LoginViewModel.Step.EnterPkceCredentials -> {
+                println("LoginActivity.onMoveToStep EnterPkceCredentials")
+                viewModel.ssoLogin()
+            }
+
             LoginViewModel.Step.Cancelled -> finish()
         }
     }
@@ -186,4 +190,4 @@ abstract class LoginActivity : AuthenticationActivity<LoginViewModel>() {
             current = queue.poll()
         }
     }
-}
+}
\ No newline at end of file
diff --git a/auth/src/main/kotlin/com/alfresco/auth/activity/LoginViewModel.kt b/auth/src/main/kotlin/com/alfresco/auth/activity/LoginViewModel.kt
index 243cdf0e..20c0aef5 100644
--- a/auth/src/main/kotlin/com/alfresco/auth/activity/LoginViewModel.kt
+++ b/auth/src/main/kotlin/com/alfresco/auth/activity/LoginViewModel.kt
@@ -11,19 +11,19 @@ import androidx.lifecycle.viewModelScope
 import com.alfresco.android.aims.R
 import com.alfresco.auth.AuthConfig
 import com.alfresco.auth.AuthType
-import com.alfresco.auth.config.defaultAuth0Config
-import com.alfresco.auth.config.defaultKeycloakConfig
+import com.alfresco.auth.AuthTypeProvider
+import com.alfresco.auth.config.defaultConfig
 import com.alfresco.auth.data.LiveEvent
 import com.alfresco.auth.data.MutableLiveEvent
+import com.alfresco.auth.data.OAuth2Data
 import com.alfresco.auth.ui.AuthenticationViewModel
-import com.alfresco.content.data.OptionsModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class LoginViewModel(
     private val applicationContext: Context,
-    val authType: AuthType?,
+    authType: AuthType?,
     authState: String?,
     authConfig: AuthConfig?,
     endpoint: String?,
@@ -59,9 +59,7 @@ class LoginViewModel(
     val canonicalApplicationUrl: String
         get() {
             return previousAppEndpoint
-                ?: if (authType == AuthType.PKCE) {
-                    discoveryService.contentServiceUrl(applicationUrl.value!!).toString()
-                } else discoveryService.oidcUrl(applicationUrl.value!!).toString()
+                ?: discoveryService.contentServiceUrl(applicationUrl.value!!, authConfig.authType).toString()
         }
 
     // Used for display purposes
@@ -98,11 +96,14 @@ class LoginViewModel(
     }
 
     fun startEditing() {
-        authConfigEditor = AuthConfigEditor(context)
+        authConfigEditor = AuthConfigEditor()
         authConfigEditor.reset(authConfig)
     }
 
     fun connect() {
+
+        println("connect to server")
+
         isLoading.value = true
 
         try {
@@ -112,33 +113,68 @@ class LoginViewModel(
         }
     }
 
-    private fun onAuthType(authType: AuthType) {
+    private fun onAuthType(authType: AuthType, oAuth2Data: OAuth2Data?) {
+
+        println("LoginViewModel.onAuthType 1 ==== $oAuth2Data")
+
+
+        if (oAuth2Data != null && oAuth2Data.secret.isNotEmpty()) {
+
+            println("LoginViewModel.onAuthType 2 ==== ${Uri.parse(oAuth2Data.host).host}")
+
+            val host = Uri.parse(oAuth2Data.host).host ?: ""
+
+            var additionalParams = mutableMapOf<String, String>()
+
+            if (oAuth2Data.audience.isNotEmpty()) {
+
+                val key = OAuth2Data::audience.name
+                val value = oAuth2Data.audience
+
+                additionalParams[key] = value
+
+            }
+
+            authConfig = AuthConfig(
+                https = authConfig.https,
+                port = "",
+                contentServicePath = "",
+                realm = "",
+                clientId = oAuth2Data.clientId,
+                redirectUrl = "demo://$host/android/com.alfresco.content.app.debug/callback",
+                host = host,
+                secret = oAuth2Data.secret,
+                scope = oAuth2Data.scope,
+                authType = AuthTypeProvider.NEW_IDP,
+                additionalParams = additionalParams
+            )
+        }
+
         when (authType) {
             AuthType.PKCE -> {
                 viewModelScope.launch {
-                    val isContentServicesInstalled =
-                        withContext(Dispatchers.IO) {
-                            discoveryService.isContentServiceInstalled(identityUrl.value ?: "")
+
+                    when (authConfig.authType) {
+                        AuthTypeProvider.NEW_IDP -> {
+                            applicationUrl.value = identityUrl.value
+                            moveToStep(Step.EnterPkceCredentials)
                         }
 
-                    if (isContentServicesInstalled) {
-                        applicationUrl.value = identityUrl.value
-                        moveToStep(Step.EnterPkceCredentials)
-                    } else {
-                        moveToStep(Step.InputAppServer)
+                        else -> {
+                            val isContentServicesInstalled =
+                                withContext(Dispatchers.IO) {
+                                    discoveryService.isContentServiceInstalled(identityUrl.value ?: "")
+                                }
+                            if (isContentServicesInstalled) {
+                                applicationUrl.value = identityUrl.value
+                                moveToStep(Step.EnterPkceCredentials)
+                            } else {
+                                moveToStep(Step.InputAppServer)
+                            }
+                        }
                     }
-                }
-            }
 
-            AuthType.OIDC -> {
-                viewModelScope.launch {
-                    val isOIDCInstalled = withContext(Dispatchers.IO) {
-                        discoveryService.isOIDCInstalled(identityUrl.value ?: "")
-                    }
-                    if (isOIDCInstalled) {
-                        applicationUrl.value = identityUrl.value
-                        moveToStep(Step.EnterAuth0Credentials)
-                    }
+
                 }
             }
 
@@ -156,6 +192,7 @@ class LoginViewModel(
         isLoading.value = true
 
         val endpoint = requireNotNull(identityUrl.value)
+        println("LoginViewModel.ssoLogin entered ==== $endpoint")
         pkceLogin(endpoint, authConfig, previousAuthState)
     }
 
@@ -188,7 +225,7 @@ class LoginViewModel(
         val sharedPrefs = applicationContext.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
         val configJson = sharedPrefs.getString(SHARED_PREFS_CONFIG_KEY, null) ?: ""
 
-        authConfig = AuthConfig.jsonDeserialize(configJson) ?: AuthConfig.defaultKeycloakConfig
+        authConfig = AuthConfig.jsonDeserialize(configJson) ?: AuthConfig.defaultConfig
     }
 
     fun saveConfigChanges() {
@@ -225,7 +262,7 @@ class LoginViewModel(
                 applicationUrl.value = identityUrl.value
             }
 
-            Step.EnterPkceCredentials, Step.EnterAuth0Credentials -> {
+            Step.EnterPkceCredentials -> {
             }
 
             Step.Cancelled -> {
@@ -240,7 +277,6 @@ class LoginViewModel(
         InputAppServer,
         EnterBasicCredentials,
         EnterPkceCredentials,
-        EnterAuth0Credentials,
         Cancelled,
     }
 
@@ -310,36 +346,20 @@ class LoginViewModel(
         }
     }
 
-    class AuthConfigEditor(val context: Context) {
+    class AuthConfigEditor {
         private lateinit var source: AuthConfig
         private val _changed = MediatorLiveData<Boolean>()
 
-        val authTypeValue = MutableLiveData<String>()
-        val authTypeName = MutableLiveData<String>()
         val https = MutableLiveData<Boolean>()
         val port = MutableLiveData<String>()
         val contentServicePath = MutableLiveData<String>()
         val realm = MutableLiveData<String>()
         val clientId = MutableLiveData<String>()
         private var redirectUrl: String = ""
-        private var scheme: String = ""
 
         val changed: LiveData<Boolean> get() = _changed
 
-        val listAuthType = listOf(
-            OptionsModel(
-                id = AuthType.PKCE.value,
-                name = context.getString(R.string.text_auth_keycloak),
-            ),
-            OptionsModel(
-                id = AuthType.OIDC.value,
-                name = context.getString(R.string.text_auth_oidc_auth0),
-            ),
-        )
-
         init {
-            _changed.addSource(authTypeValue, this::onChange)
-            _changed.addSource(authTypeName, this::onChange)
             _changed.addSource(https, this::onChange)
             _changed.addSource(port, this::onChange)
             _changed.addSource(contentServicePath, this::onChange)
@@ -359,15 +379,6 @@ class LoginViewModel(
             port.value = if (https.value == true) DEFAULT_HTTPS_PORT else DEFAULT_HTTP_PORT
         }
 
-        fun onAuthChange(authName: String, authValue: String) {
-            authTypeName.value = authName
-            authTypeValue.value = authValue
-            when (authValue.lowercase()) {
-                AuthType.PKCE.value.lowercase() -> load(AuthConfig.defaultKeycloakConfig)
-                AuthType.OIDC.value.lowercase() -> load(AuthConfig.defaultAuth0Config)
-            }
-        }
-
         private fun onChange(
             @Suppress("UNUSED_PARAMETER") value: Boolean,
         ) {
@@ -391,22 +402,16 @@ class LoginViewModel(
 
         fun resetToDefaultConfig() {
             // Source is not changed as resetting to default does not commit changes
-            when (authTypeValue.value?.lowercase()) {
-                AuthType.PKCE.value.lowercase() -> load(AuthConfig.defaultKeycloakConfig)
-                AuthType.OIDC.value.lowercase() -> load(AuthConfig.defaultAuth0Config)
-            }
+            load(AuthConfig.defaultConfig)
         }
 
         private fun load(config: AuthConfig) {
-            authTypeName.value = listAuthType.find { it.id == config.authType }?.name ?: ""
-            authTypeValue.value = config.authType
             https.value = config.https
             port.value = config.port
             contentServicePath.value = config.contentServicePath
             realm.value = config.realm
             clientId.value = config.clientId
             redirectUrl = config.redirectUrl
-            scheme = config.scheme
             onChange()
         }
 
@@ -418,8 +423,6 @@ class LoginViewModel(
                 realm = realm.value ?: "",
                 clientId = clientId.value ?: "",
                 redirectUrl = redirectUrl,
-                scheme = scheme,
-                authType = authTypeValue.value ?: "",
             )
         }
 
@@ -428,4 +431,4 @@ class LoginViewModel(
             private const val DEFAULT_HTTPS_PORT = "443"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/auth/src/main/kotlin/com/alfresco/auth/activity/LogoutActivity.kt b/auth/src/main/kotlin/com/alfresco/auth/activity/LogoutActivity.kt
index c63e338a..d4a87d47 100644
--- a/auth/src/main/kotlin/com/alfresco/auth/activity/LogoutActivity.kt
+++ b/auth/src/main/kotlin/com/alfresco/auth/activity/LogoutActivity.kt
@@ -9,11 +9,9 @@ import com.alfresco.auth.ui.EndSessionViewModel
 import com.alfresco.common.getViewModel
 import org.json.JSONException
 
-class LogoutViewModel(context: Context, authType: AuthType?, authState: String, authConfig: AuthConfig, serverURL: String, clientId: String) :
-    EndSessionViewModel(context, authType, authState, authConfig, serverURL, clientId) {
+class LogoutViewModel(context: Context, authType: AuthType?, authState: String, authConfig: AuthConfig) :
+    EndSessionViewModel(context, authType, authState, authConfig) {
     companion object {
-        const val EXTRA_HOST_NAME = "host_name"
-        const val EXTRA_CLIENT_ID = "client_id"
         const val EXTRA_AUTH_TYPE = "authType"
         const val EXTRA_AUTH_STATE = "authState"
         const val EXTRA_AUTH_CONFIG = "authConfig"
@@ -26,8 +24,6 @@ class LogoutViewModel(context: Context, authType: AuthType?, authState: String,
 
             val stateString = bundle.getString(EXTRA_AUTH_STATE)
             val configString = bundle.getString(EXTRA_AUTH_CONFIG)
-            val hostName = bundle.getString(EXTRA_HOST_NAME)
-            val clientId = bundle.getString(EXTRA_CLIENT_ID)
             val authType = bundle.getString(EXTRA_AUTH_TYPE)?.let { AuthType.fromValue(it) }
 
             val config =
@@ -38,16 +34,13 @@ class LogoutViewModel(context: Context, authType: AuthType?, authState: String,
                         null
                     }
                 } catch (ex: JSONException) {
-                    ex.printStackTrace()
-                null
-            }
+                    null
+                }
 
             requireNotNull(stateString)
-            requireNotNull(hostName)
-            requireNotNull(clientId)
             requireNotNull(config)
 
-            return LogoutViewModel(context, authType, stateString, config, hostName, clientId)
+            return LogoutViewModel(context, authType, stateString, config)
         }
     }
 }
@@ -58,4 +51,4 @@ class LogoutActivity : EndSessionActivity<LogoutViewModel>() {
             LogoutViewModel.with(applicationContext, intent.extras)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/auth/src/main/kotlin/com/alfresco/auth/fragments/AdvancedSettingsFragment.kt b/auth/src/main/kotlin/com/alfresco/auth/fragments/AdvancedSettingsFragment.kt
index f5cd2861..84df7044 100644
--- a/auth/src/main/kotlin/com/alfresco/auth/fragments/AdvancedSettingsFragment.kt
+++ b/auth/src/main/kotlin/com/alfresco/auth/fragments/AdvancedSettingsFragment.kt
@@ -17,16 +17,11 @@ import com.alfresco.android.aims.databinding.FragmentAuthSettingsBinding
 import com.alfresco.auth.activity.LoginViewModel
 import com.alfresco.auth.ui.observe
 import com.alfresco.common.FragmentBuilder
-import com.alfresco.content.component.ComponentBuilder
-import com.alfresco.content.component.ComponentData
-import com.alfresco.content.component.ComponentType
-import com.alfresco.content.setSafeOnClickListener
 import com.google.android.material.snackbar.Snackbar
 
 class AdvancedSettingsFragment : DialogFragment() {
     private val viewModel: LoginViewModel by activityViewModels()
     private val rootView: View get() = requireView()
-    private lateinit var binding: FragmentAuthSettingsBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -39,24 +34,13 @@ class AdvancedSettingsFragment : DialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_auth_settings, container, false)
+        val binding = DataBindingUtil.inflate<FragmentAuthSettingsBinding>(inflater, R.layout.fragment_auth_settings, container, false)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
         viewModel.startEditing()
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.tieAuthType.inputType = 0
-        binding.tieAuthType.setOnFocusChangeListener { textView, hasFocus ->
-            if (hasFocus) textView.performClick()
-        }
-        binding.tieAuthType.setSafeOnClickListener {
-            openAuthSelection()
-        }
-    }
-
     override fun onStart() {
         super.onStart()
 
@@ -89,35 +73,10 @@ class AdvancedSettingsFragment : DialogFragment() {
                 viewModel.authConfigEditor.resetToDefaultConfig()
                 true
             }
-
             else -> super.onOptionsItemSelected(item)
         }
     }
 
-    private fun openAuthSelection() {
-        val authName = viewModel.authConfigEditor.authTypeName.value ?: ""
-        val authValue = viewModel.authConfigEditor.authTypeValue.value ?: ""
-
-        val componentData = ComponentData.with(
-            outcomes = viewModel.authConfigEditor.listAuthType,
-            name = authName,
-            query = authValue,
-            title = binding.tilAuthType.hint.toString(),
-            selector = ComponentType.DROPDOWN_RADIO.value,
-        )
-        ComponentBuilder(requireContext(), componentData)
-            .onApply { name, query, _ ->
-                viewModel.authConfigEditor.onAuthChange(name, query)
-            }
-            .onReset { name, query, _ ->
-                viewModel.authConfigEditor.onAuthChange(name, query)
-            }
-            .onCancel {
-                viewModel.authConfigEditor.onAuthChange(authName, authValue)
-            }
-            .show()
-    }
-
     class Builder(parent: FragmentActivity) : FragmentBuilder(parent) {
         override val fragmentTag = TAG
 
@@ -134,4 +93,4 @@ class AdvancedSettingsFragment : DialogFragment() {
 
         fun with(activity: FragmentActivity): Builder = Builder(activity)
     }
-}
+}
\ No newline at end of file
diff --git a/auth/src/main/res/layout/fragment_auth_settings.xml b/auth/src/main/res/layout/fragment_auth_settings.xml
index fa3120f6..2a2c52ab 100644
--- a/auth/src/main/res/layout/fragment_auth_settings.xml
+++ b/auth/src/main/res/layout/fragment_auth_settings.xml
@@ -2,9 +2,6 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
-
-        <import type="android.view.View" />
-
         <variable
             name="viewModel"
             type="com.alfresco.auth.activity.LoginViewModel" />
@@ -12,10 +9,10 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingTop="?attr/actionBarSize"
         android:background="?attr/colorSurface"
-        android:fillViewport="true"
-        android:paddingTop="?attr/actionBarSize">
+        android:fillViewport="true">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -24,164 +21,140 @@
             android:paddingStart="@dimen/auth_theme_default_padding"
             android:paddingEnd="@dimen/auth_theme_default_padding">
 
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/auth_settings_header_height">
+
+                <TextView
+                    android:id="@+id/tvProtocolTitle"
+                    style="@style/Widget.Alfresco.Auth.SectionText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
+                    android:text="@string/auth_settings_transport_section" />
+            </FrameLayout>
+
+            <RelativeLayout
+                android:id="@+id/tvProtocol"
+                android:layout_width="match_parent"
+                android:layout_height="48dp">
+
+                <TextView
+                    style="@style/Widget.Alfresco.Auth.SectionText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="10dp"
+                    android:layout_toStartOf="@id/tvProtocolSwitch"
+                    android:enabled="@{viewModel.authConfigEditor.https}"
+                    android:text="@string/auth_settings_transport_https"
+                    android:textColor="@color/alfresco_text_primary_color" />
+
+                <com.alfresco.ui.components.Switch
+                    android:id="@+id/tvProtocolSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:checked="@={viewModel.authConfigEditor.https}"
+                    android:onClick="@{(v) -> viewModel.authConfigEditor.onHttpsToggle()}"
+                    android:onTouchEvent="@{(v, e) -> viewModel.authConfigEditor.onHttpsToggle()}" />
+            </RelativeLayout>
+
             <com.alfresco.ui.components.TextInputLayout
-                android:id="@+id/til_auth_type"
+                android:id="@+id/tilPort"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="AuthType">
+                android:hint="@string/auth_settings_transport_port">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/tie_auth_type"
+                    android:id="@+id/etPort"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="text"
+                    android:inputType="number"
                     android:maxLines="1"
-                    android:text="@={viewModel.authConfigEditor.authTypeName}" />
+                    android:text="@={viewModel.authConfigEditor.port}" />
+
             </com.alfresco.ui.components.TextInputLayout>
 
-            <LinearLayout
-                android:id="@+id/ll_keycloak"
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/auth_settings_header_height"
+                android:layout_marginTop="@dimen/auth_settings_section_spacing">
+
+                <TextView
+                    style="@style/Widget.Alfresco.Auth.SectionText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
+                    android:text="@string/auth_settings_service_section" />
+            </FrameLayout>
+
+            <com.alfresco.ui.components.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="@{viewModel.authConfigEditor.authTypeValue.equals(&quot;pkce&quot;)? View.VISIBLE: View.GONE}">
+                android:hint="@string/auth_settings_service_path">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/auth_settings_header_height">
-
-                    <TextView
-                        android:id="@+id/tvProtocolTitle"
-                        style="@style/Widget.Alfresco.Auth.SectionText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
-                        android:text="@string/auth_settings_transport_section" />
-                </FrameLayout>
-
-                <RelativeLayout
-                    android:id="@+id/tvProtocol"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp">
-
-                    <TextView
-                        style="@style/Widget.Alfresco.Auth.SectionText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="10dp"
-                        android:layout_toStartOf="@id/tvProtocolSwitch"
-                        android:enabled="@{viewModel.authConfigEditor.https}"
-                        android:text="@string/auth_settings_transport_https"
-                        android:textColor="@color/alfresco_text_primary_color" />
-
-                    <com.alfresco.ui.components.Switch
-                        android:id="@+id/tvProtocolSwitch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:checked="@={viewModel.authConfigEditor.https}"
-                        android:onClick="@{(v) -> viewModel.authConfigEditor.onHttpsToggle()}"
-                        android:onTouchEvent="@{(v, e) -> viewModel.authConfigEditor.onHttpsToggle()}" />
-                </RelativeLayout>
-
-                <com.alfresco.ui.components.TextInputLayout
-                    android:id="@+id/tilPort"
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/auth_settings_transport_port">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/etPort"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="number"
-                        android:maxLines="1"
-                        android:text="@={viewModel.authConfigEditor.port}" />
+                    android:inputType="text|textNoSuggestions"
+                    android:maxLines="1"
+                    android:text="@={viewModel.authConfigEditor.contentServicePath}" />
+            </com.alfresco.ui.components.TextInputLayout>
 
-                </com.alfresco.ui.components.TextInputLayout>
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/auth_settings_header_height"
+                android:layout_marginTop="@dimen/auth_settings_section_spacing">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/auth_settings_header_height"
-                    android:layout_marginTop="@dimen/auth_settings_section_spacing">
-
-                    <TextView
-                        style="@style/Widget.Alfresco.Auth.SectionText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
-                        android:text="@string/auth_settings_service_section" />
-                </FrameLayout>
-
-                <com.alfresco.ui.components.TextInputLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/tvAuthentication"
+                    style="@style/Widget.Alfresco.Auth.SectionText"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:hint="@string/auth_settings_service_path">
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
+                    android:text="@string/auth_settings_auth_section" />
+            </FrameLayout>
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="text|textNoSuggestions"
-                        android:maxLines="1"
-                        android:text="@={viewModel.authConfigEditor.contentServicePath}" />
-                </com.alfresco.ui.components.TextInputLayout>
+            <com.alfresco.ui.components.TextInputLayout
+                android:id="@+id/tilRealm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/auth_settings_auth_realm">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/auth_settings_header_height"
-                    android:layout_marginTop="@dimen/auth_settings_section_spacing">
-
-                    <TextView
-                        android:id="@+id/tvAuthentication"
-                        style="@style/Widget.Alfresco.Auth.SectionText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginBottom="@dimen/auth_settings_header_title_offset"
-                        android:text="@string/auth_settings_auth_section" />
-                </FrameLayout>
-
-                <com.alfresco.ui.components.TextInputLayout
-                    android:id="@+id/tilRealm"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/etRealm"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/auth_settings_auth_realm">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/etRealm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="text|textNoSuggestions"
-                        android:maxLines="1"
-                        android:text="@={viewModel.authConfigEditor.realm}" />
-                </com.alfresco.ui.components.TextInputLayout>
-
-                <com.alfresco.ui.components.TextInputLayout
-                    android:id="@+id/tilClientId"
+                    android:inputType="text|textNoSuggestions"
+                    android:maxLines="1"
+                    android:text="@={viewModel.authConfigEditor.realm}" />
+            </com.alfresco.ui.components.TextInputLayout>
+
+            <com.alfresco.ui.components.TextInputLayout
+                android:id="@+id/tilClientId"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:hint="@string/auth_settings_auth_client_id">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/etClientId"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:hint="@string/auth_settings_auth_client_id">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/etClientId"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="text|textNoSuggestions"
-                        android:maxLines="1"
-                        android:text="@={viewModel.authConfigEditor.clientId}" />
-                </com.alfresco.ui.components.TextInputLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
+                    android:inputType="text|textNoSuggestions"
+                    android:maxLines="1"
+                    android:text="@={viewModel.authConfigEditor.clientId}" />
+            </com.alfresco.ui.components.TextInputLayout>
 
-            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -219,4 +192,4 @@
         </LinearLayout>
 
     </ScrollView>
-</layout>
+</layout>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a86bec7..e0c338e3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -131,4 +131,15 @@ ui-compose-viewbinding = "androidx.compose.ui:ui-viewbinding:1.7.3"
 navigation-compose = "androidx.navigation:navigation-compose:2.8.2"
 compose-runtime = "androidx.compose.runtime:runtime:1.7.3"
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "ui-tooling" }
-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
\ No newline at end of file
+constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+
+
+dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20"
+kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
+appauth = "net.openid:appauth:0.11.1"
+jwtdecode = "com.auth0.android:jwtdecode:2.0.2"
+kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
+
+androidx-lifecycle-viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
+androidx-browser = "androidx.browser:browser:1.8.0"
+okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
\ No newline at end of file