diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 7a67f902e..8cffb3303 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -10,7 +10,7 @@ def kotlinVersion = '1.9.21'
 def versions = [
         dagger                         : '2.45',
         kotlin                         : kotlinVersion,
-        mviCore                        : '1.4.0',
+        mviCore                        : '2.0.0',
         robolectric                    : '4.13',
         composeBom                     : '2023.10.01',
         composeCompiler                : '1.5.7',
@@ -37,7 +37,7 @@ def versions = [
         androidxSavedStateVersion      : '1.2.0', // https://developer.android.com/jetpack/androidx/releases/savedstate
         androidxTestVersion            : '1.5.0', // https://developer.android.com/jetpack/androidx/releases/test
         androidxTestUiAutoVersion      : '2.2.0',
-        retrofitVersion                : '2.9.0',
+        retrofitVersion                : '2.11.0',
         okhttp                         : '3.14.7',
         leakCanary                     : '2.9.1',
         jacoco                         : '0.8.8',
@@ -52,7 +52,7 @@ def apt = [
         javaxInject   : "javax.inject:javax.inject:1",
 ]
 
-def agp = 'com.android.tools.build:gradle:8.2.2'
+def agp = 'com.android.tools.build:gradle:8.9.1'
 
 def build = [
         compileSdk      : 34,
@@ -114,9 +114,9 @@ def external = [
         mviCoreAndroid     : "com.github.badoo.mvicore:mvicore-android:${versions.mviCore}",
         mviCoreBinder      : "com.github.badoo.mvicore:binder:${versions.mviCore}",
         mviCoreDiff        : "com.github.badoo.mvicore:mvicore-diff:${versions.mviCore}",
-        rxjava2            : "io.reactivex.rxjava2:rxjava:2.2.18",
-        rxrelay2           : "com.jakewharton.rxrelay2:rxrelay:2.1.0",
-        rxandroid2         : "io.reactivex.rxjava2:rxandroid:2.1.1",
+        rxjava3            : "io.reactivex.rxjava3:rxjava:3.1.10",
+        rxrelay3           : "com.jakewharton.rxrelay3:rxrelay:3.0.1",
+        rxandroid3         : "io.reactivex.rxjava3:rxandroid:3.0.2",
         roboelectricBase   : "org.robolectric:robolectric:${versions.robolectric}",
         coil               : "io.coil-kt:coil:${versions.coil}",
         leakCanary         : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}",
@@ -125,7 +125,7 @@ def external = [
 
 def retrofit = [
         retrofit                : "com.squareup.retrofit2:retrofit:${versions.retrofitVersion}",
-        rxjavaAdapter           : "com.squareup.retrofit2:adapter-rxjava2:${versions.retrofitVersion}",
+        rxjavaAdapter           : "com.squareup.retrofit2:adapter-rxjava3:${versions.retrofitVersion}",
         moshiConverter          : "com.squareup.retrofit2:converter-moshi:${versions.retrofitVersion}",
         okhttp                  : "com.squareup.okhttp3:okhttp:${versions.okhttp}",
         okhttpLoggingInterceptor: "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5fbdbe6a7..a683b5fb1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jun 14 23:02:25 BST 2020
+#Wed Apr 02 17:45:41 BST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/Utils.kt b/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/Utils.kt
index 7735c0ee2..157aa8ea1 100644
--- a/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/Utils.kt
+++ b/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/Utils.kt
@@ -7,7 +7,10 @@ import java.util.concurrent.TimeoutException
 private const val DEFAULT_CONDITION_TIMEOUT_MILLISECONDS = 15000L
 private const val DEFAULT_CHECK_CONDITION_FREQUENCY_MILLIS = 10L
 
-fun waitFor(timeoutMillis: Long = DEFAULT_CONDITION_TIMEOUT_MILLISECONDS, condition: () -> Boolean) {
+fun waitFor(
+    timeoutMillis: Long = DEFAULT_CONDITION_TIMEOUT_MILLISECONDS,
+    condition: () -> Boolean
+) {
     val start = System.currentTimeMillis()
     while (!condition()) {
         if (System.currentTimeMillis() > start + timeoutMillis) {
diff --git a/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/sample/SampleView.kt b/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/sample/SampleView.kt
index f484325a7..88d111bfe 100644
--- a/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/sample/SampleView.kt
+++ b/libraries/rib-base-test-activity/src/androidTest/java/com/badoo/ribs/test/sample/SampleView.kt
@@ -19,10 +19,9 @@ class SampleViewImpl(
 
     val lifecycle: Lifecycle = context.lifecycle
 
-    override val androidView: ViewGroup
+    override val androidView: ViewGroup = FrameLayout(context.parent.context)
 
     init {
-        androidView = FrameLayout(context.parent.context)
         val child = TextView(context.parent.context)
         child.id = viewId
         child.text = TextView::class.qualifiedName
diff --git a/libraries/rib-base-test-activity/src/main/AndroidManifest.xml b/libraries/rib-base-test-activity/src/main/AndroidManifest.xml
index cceb5a314..554f78ae4 100644
--- a/libraries/rib-base-test-activity/src/main/AndroidManifest.xml
+++ b/libraries/rib-base-test-activity/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/libraries/rib-base-test-rx2/gradle.properties b/libraries/rib-base-test-rx2/gradle.properties
deleted file mode 100755
index c2c879696..000000000
--- a/libraries/rib-base-test-rx2/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-POM_NAME=RIBs (Base Test Rx2 helpers)
-POM_ARTIFACT_ID=rib-base-test-rx2
-POM_PACKAGING=android
diff --git a/libraries/rib-base-test-rx2/.gitignore b/libraries/rib-base-test-rx3/.gitignore
similarity index 100%
rename from libraries/rib-base-test-rx2/.gitignore
rename to libraries/rib-base-test-rx3/.gitignore
diff --git a/libraries/rib-base-test-rx2/build.gradle b/libraries/rib-base-test-rx3/build.gradle
similarity index 76%
rename from libraries/rib-base-test-rx2/build.gradle
rename to libraries/rib-base-test-rx3/build.gradle
index 7def029a4..d30117e35 100644
--- a/libraries/rib-base-test-rx2/build.gradle
+++ b/libraries/rib-base-test-rx3/build.gradle
@@ -1,7 +1,7 @@
 configureAndroidLibrary(project)
 
 android {
-    namespace 'com.badoo.ribs.test.rx2'
+    namespace 'com.badoo.ribs.test.rx3'
 
     defaultConfig {
         versionCode 1
@@ -19,10 +19,10 @@ android {
 dependencies {
     compileOnly project(':libraries:rib-base')
     compileOnly project(':libraries:rib-base-test')
-    compileOnly project(':libraries:rib-rx2')
-    
-    api deps.external.rxjava2
-    api deps.external.rxrelay2
+    compileOnly project(':libraries:rib-rx3')
+
+    api deps.external.rxjava3
+    api deps.external.rxrelay3
     
     implementation deps.test.mockitoKotlin
 }
diff --git a/libraries/rib-base-test-rx2/detekt-baseline.xml b/libraries/rib-base-test-rx3/detekt-baseline.xml
similarity index 100%
rename from libraries/rib-base-test-rx2/detekt-baseline.xml
rename to libraries/rib-base-test-rx3/detekt-baseline.xml
diff --git a/libraries/rib-base-test-rx3/gradle.properties b/libraries/rib-base-test-rx3/gradle.properties
new file mode 100755
index 000000000..93af10f26
--- /dev/null
+++ b/libraries/rib-base-test-rx3/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=RIBs (Base Test Rx3 helpers)
+POM_ARTIFACT_ID=rib-base-test-rx3
+POM_PACKAGING=android
diff --git a/libraries/rib-base-test-rx2/lint-baseline.xml b/libraries/rib-base-test-rx3/lint-baseline.xml
similarity index 100%
rename from libraries/rib-base-test-rx2/lint-baseline.xml
rename to libraries/rib-base-test-rx3/lint-baseline.xml
diff --git a/libraries/rib-base-test-rx2/src/main/java/com/badoo/common/ribs/rx2/InteractorTestHelper.kt b/libraries/rib-base-test-rx3/src/main/java/com/badoo/common/ribs/rx3/InteractorTestHelper.kt
similarity index 70%
rename from libraries/rib-base-test-rx2/src/main/java/com/badoo/common/ribs/rx2/InteractorTestHelper.kt
rename to libraries/rib-base-test-rx3/src/main/java/com/badoo/common/ribs/rx3/InteractorTestHelper.kt
index 38f6b98fb..ad919cf9b 100644
--- a/libraries/rib-base-test-rx2/src/main/java/com/badoo/common/ribs/rx2/InteractorTestHelper.kt
+++ b/libraries/rib-base-test-rx3/src/main/java/com/badoo/common/ribs/rx3/InteractorTestHelper.kt
@@ -1,26 +1,26 @@
-package com.badoo.common.ribs.rx2
+package com.badoo.common.ribs.rx3
 
 import android.view.ViewGroup
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.test.InteractorTestHelper
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
-import io.reactivex.ObservableSource
-import io.reactivex.Observer
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.core.Observer
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
 
 @Deprecated("Use RibInteractorTestHelper")
-inline fun <reified View, ViewEvent> createInteractorTestHelper(
+inline fun <reified View, ViewEvent : Any> createInteractorTestHelper(
     interactor: Interactor<*, View>,
     viewEventRelay: Relay<ViewEvent>
 ): InteractorTestHelper<View> where View : RibView, View : ObservableSource<ViewEvent> {
     val view: View = viewEventRelay.subscribedView()
-    return InteractorTestHelper(interactor, { view })
+    return InteractorTestHelper(interactor) { view }
 }
 
 @Deprecated("Use RibInteractorTestHelper")
@@ -36,7 +36,7 @@ inline fun <reified R, reified Input, reified Output> Interactor<R, *>.mockIO(
 }
 
 @Deprecated("Use RibInteractorTestHelper")
-inline fun <reified RView, ViewEvent> Relay<ViewEvent>.subscribedView(): RView where RView : RibView, RView : ObservableSource<ViewEvent> =
+inline fun <reified RView, ViewEvent : Any> Relay<ViewEvent>.subscribedView(): RView where RView : RibView, RView : ObservableSource<ViewEvent> =
     mock<RView>().apply {
         whenever(this.androidView).thenReturn(mock<ViewGroup>())
         whenever(this.subscribe(any())).thenAnswer {
diff --git a/libraries/rib-base-test-rx2/src/main/java/com/badoo/ribs/test/rx2/view/RibViewStub.kt b/libraries/rib-base-test-rx3/src/main/java/com/badoo/ribs/test/rx3/view/RibViewStub.kt
similarity index 84%
rename from libraries/rib-base-test-rx2/src/main/java/com/badoo/ribs/test/rx2/view/RibViewStub.kt
rename to libraries/rib-base-test-rx3/src/main/java/com/badoo/ribs/test/rx3/view/RibViewStub.kt
index 0abefa199..3a3b7679c 100644
--- a/libraries/rib-base-test-rx2/src/main/java/com/badoo/ribs/test/rx2/view/RibViewStub.kt
+++ b/libraries/rib-base-test-rx3/src/main/java/com/badoo/ribs/test/rx3/view/RibViewStub.kt
@@ -1,14 +1,14 @@
-package com.badoo.ribs.test.rx2.view
+package com.badoo.ribs.test.rx3.view
 
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.ViewGroup
 import com.badoo.ribs.core.view.AndroidRibView
 import com.badoo.ribs.test.assertEquals
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 import org.mockito.Mockito.mock
 
 /* Sync with other versions. */
diff --git a/libraries/rib-base-test/src/main/java/com/badoo/ribs/test/InteractorTestHelper.kt b/libraries/rib-base-test/src/main/java/com/badoo/ribs/test/InteractorTestHelper.kt
index b252d10da..057154876 100644
--- a/libraries/rib-base-test/src/main/java/com/badoo/ribs/test/InteractorTestHelper.kt
+++ b/libraries/rib-base-test/src/main/java/com/badoo/ribs/test/InteractorTestHelper.kt
@@ -28,6 +28,7 @@ class InteractorTestHelper<View : RibView>(
         when (state) {
             Lifecycle.State.DESTROYED,
             Lifecycle.State.INITIALIZED -> throw IllegalArgumentException("Unsupported state: $state")
+
             Lifecycle.State.CREATED -> toAttachViewState(block)
             Lifecycle.State.STARTED -> toStartState(block)
             Lifecycle.State.RESUMED -> toResumeState(block)
diff --git a/libraries/rib-base/build.gradle b/libraries/rib-base/build.gradle
index 08daa0a5a..9feb6e655 100644
--- a/libraries/rib-base/build.gradle
+++ b/libraries/rib-base/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testImplementation deps.external.mviCore
     testImplementation deps.external.mviCoreAndroid
     testImplementation deps.external.mviCoreBinder
-    testImplementation deps.external.rxrelay2
+    testImplementation deps.external.rxrelay3
 
     junitTestImplementation(project)
     testImplementation deps.android.annotations
@@ -28,14 +28,14 @@ dependencies {
     testImplementation deps.test.mockitoKotlin
     testImplementation project(":libraries:rib-base-test")
 
-    androidTestImplementation deps.external.rxjava2
+    androidTestImplementation deps.external.rxjava3
     junitAndroidTestImplementation(project)
     androidTestImplementation deps.test.assertj
     androidTestImplementation deps.androidTest.espresso
     androidTestImplementation deps.androidTest.espressoIntents
     androidTestImplementation deps.androidTest.runner
     androidTestImplementation deps.androidTest.rules
-    androidTestImplementation project(":libraries:rib-rx2")
+    androidTestImplementation project(':libraries:rib-rx3')
     androidTestImplementation project(":libraries:rib-base-test")
     androidTestImplementation project(':libraries:rib-base-test-activity')
 }
diff --git a/libraries/rib-base/src/androidTest/AndroidManifest.xml b/libraries/rib-base/src/androidTest/AndroidManifest.xml
index bf141c50d..213e71da5 100644
--- a/libraries/rib-base/src/androidTest/AndroidManifest.xml
+++ b/libraries/rib-base/src/androidTest/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <application
-            android:allowBackup="true"
-            android:supportsRtl="true"
-            android:theme="@style/Theme.AppCompat">
+        android:allowBackup="true"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.AppCompat">
 
         <activity android:name="com.badoo.ribs.test.util.TestActivity" />
         <activity android:name="com.badoo.ribs.test.util.OtherActivity" />
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/ActivityStarterTest.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/ActivityStarterTest.kt
index 15d7fe690..b58cb0341 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/ActivityStarterTest.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/ActivityStarterTest.kt
@@ -14,14 +14,14 @@ import androidx.test.espresso.intent.rule.IntentsTestRule
 import com.badoo.ribs.android.activitystarter.ActivityResultHandler
 import com.badoo.ribs.android.activitystarter.ActivityStarter.ActivityResultEvent
 import com.badoo.ribs.android.requestcode.RequestCodeClient
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.test.util.OtherActivity
 import com.badoo.ribs.test.util.TestActivity
 import com.badoo.ribs.test.util.TestRequestCodeClient
 import com.badoo.ribs.test.util.restartActivitySync
 import com.badoo.ribs.test.util.subscribeOnTestObserver
 import com.badoo.ribs.test.util.waitForIdle
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.assertj.core.api.Assertions.assertThat
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.Rule
@@ -31,7 +31,7 @@ import org.junit.Test
 class ActivityStarterTest {
 
     @get:Rule
-    val activityRule = IntentsTestRule<TestActivity>(TestActivity::class.java)
+    val activityRule = IntentsTestRule(TestActivity::class.java)
 
     @Test
     fun startActivity_startsTargetActivity() {
@@ -49,17 +49,22 @@ class ActivityStarterTest {
                 .putExtra("some_param", "some_value")
         }
 
-        intended(allOf(
-            hasComponent(ComponentName(getTargetContext(), OtherActivity::class.java)),
-            hasExtra("some_param", "some_value")
-        ))
+        intended(
+            allOf(
+                hasComponent(ComponentName(getTargetContext(), OtherActivity::class.java)),
+                hasExtra("some_param", "some_value")
+            )
+        )
     }
 
     @Test
     fun startActivityForResult_startsTargetActivity() {
-        activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        activityRule.activity.activityStarter.events(identifiable).rx3().subscribeOnTestObserver()
 
-        activityRule.activity.activityStarter.startActivityForResult(identifiable, requestCode = 1) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            identifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
 
@@ -69,9 +74,13 @@ class ActivityStarterTest {
     @Test
     fun startActivityForResult_startActivityThatReturnsOkResult_returnsOkResultCode() {
         givenResultForActivity<OtherActivity>(resultCode = RESULT_OK)
-        val observer = activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(identifiable).rx3()
+            .subscribeOnTestObserver()
 
-        activityRule.activity.activityStarter.startActivityForResult(identifiable, requestCode = 1) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            identifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
 
@@ -82,15 +91,19 @@ class ActivityStarterTest {
 
     @Test
     fun startActivityForResult_startActivityThatReturnsOkResultAndRestart_returnsOkResultCode() {
-        activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        activityRule.activity.activityStarter.events(identifiable).rx3().subscribeOnTestObserver()
         activityRule.activity.ignoreActivityStarts = true
 
-        activityRule.activity.activityStarter.startActivityForResult(identifiable, requestCode = 1) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            identifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
         val requestCode = activityRule.activity.lastStartedRequestCode
         activityRule.restartActivitySync()
-        val observer = activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(identifiable).rx3()
+            .subscribeOnTestObserver()
         (activityRule.activity.activityStarter as ActivityResultHandler).onActivityResult(
             requestCode,
             RESULT_OK,
@@ -104,15 +117,18 @@ class ActivityStarterTest {
 
     @Test
     fun startActivityForResult_startActivitiesWithCollisionThatReturnsOkResultAndRestart_returnsOkResultCode() {
-        assertThat(collisionIdentifiable1.requestCodeClientId.hashCode()).isEqualTo(collisionIdentifiable2.requestCodeClientId.hashCode())
-        activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        assertThat(collisionIdentifiable1.requestCodeClientId.hashCode()).isEqualTo(
+            collisionIdentifiable2.requestCodeClientId.hashCode()
+        )
+        activityRule.activity.activityStarter.events(identifiable).rx3().subscribeOnTestObserver()
         activityRule.activity.ignoreActivityStarts = true
 
         startOtherActivity(collisionIdentifiable1, requestCode = 1)
         startOtherActivity(collisionIdentifiable2, requestCode = 1)
         val requestCode = activityRule.activity.lastStartedRequestCode
         activityRule.restartActivitySync()
-        val observer = activityRule.activity.activityStarter.events(collisionIdentifiable2).rx2().subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(collisionIdentifiable2).rx3()
+            .subscribeOnTestObserver()
         (activityRule.activity.activityStarter as ActivityResultHandler).onActivityResult(
             requestCode,
             RESULT_OK,
@@ -127,9 +143,13 @@ class ActivityStarterTest {
     @Test
     fun startActivityForResult_startActivityThatReturnsCancelledResult_returnsCancelledResultCode() {
         givenResultForActivity<OtherActivity>(resultCode = RESULT_CANCELED)
-        val observer = activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(identifiable).rx3()
+            .subscribeOnTestObserver()
 
-        activityRule.activity.activityStarter.startActivityForResult(identifiable, requestCode = 1) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            identifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
 
@@ -142,9 +162,13 @@ class ActivityStarterTest {
     fun startActivityForResult_startActivityThatReturnsIntentData_returnsIntentData() {
         val data = Intent().apply { putExtra("some_param", "some_value") }
         givenResultForActivity<OtherActivity>(resultCode = RESULT_OK, data = data)
-        val observer = activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(identifiable).rx3()
+            .subscribeOnTestObserver()
 
-        activityRule.activity.activityStarter.startActivityForResult(identifiable, requestCode = 1) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            identifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
 
@@ -157,10 +181,16 @@ class ActivityStarterTest {
     fun startActivityForResult_startActivityWhenWeHaveMultipleIdentifiers_returnsResultEventOnlyForOne() {
         val otherIdentifiable = TestRequestCodeClient("other")
         givenResultForActivity<OtherActivity>(resultCode = RESULT_OK)
-        val otherIdentifiableObserver = activityRule.activity.activityStarter.events(otherIdentifiable).rx2().subscribeOnTestObserver()
-        val observer = activityRule.activity.activityStarter.events(identifiable).rx2().subscribeOnTestObserver()
-
-        activityRule.activity.activityStarter.startActivityForResult(otherIdentifiable, requestCode = 1) {
+        val otherIdentifiableObserver =
+            activityRule.activity.activityStarter.events(otherIdentifiable).rx3()
+                .subscribeOnTestObserver()
+        val observer = activityRule.activity.activityStarter.events(identifiable).rx3()
+            .subscribeOnTestObserver()
+
+        activityRule.activity.activityStarter.startActivityForResult(
+            otherIdentifiable,
+            requestCode = 1
+        ) {
             Intent(this, OtherActivity::class.java)
         }
 
@@ -176,11 +206,19 @@ class ActivityStarterTest {
     }
 
     private inline fun <reified T> givenResultForActivity(resultCode: Int, data: Intent? = null) {
-        intending(hasComponent(T::class.java.name)).respondWith(Instrumentation.ActivityResult(resultCode, data))
+        intending(hasComponent(T::class.java.name)).respondWith(
+            Instrumentation.ActivityResult(
+                resultCode,
+                data
+            )
+        )
     }
 
     private fun startOtherActivity(client: RequestCodeClient, requestCode: Int) {
-        activityRule.activity.activityStarter.startActivityForResult(client, requestCode = requestCode) {
+        activityRule.activity.activityStarter.startActivityForResult(
+            client,
+            requestCode = requestCode
+        ) {
             Intent(this, OtherActivity::class.java)
         }
     }
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/dialogkeyboard/AlertDialogKeyboardTest.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/dialogkeyboard/AlertDialogKeyboardTest.kt
index a0d8e9e4c..eee8cf861 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/dialogkeyboard/AlertDialogKeyboardTest.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/dialogkeyboard/AlertDialogKeyboardTest.kt
@@ -45,7 +45,8 @@ class AlertDialogKeyboardTest {
                 .getInstrumentation()
                 .targetContext
                 .getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-            val hasKeyboard = inputManager != null && inputManager.isActive && inputManager.isAcceptingText
+            val hasKeyboard =
+                inputManager != null && inputManager.isActive && inputManager.isAcceptingText
             hasKeyboard
         }
     }
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/BaseNodesTest.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/BaseNodesTest.kt
index aff6cd58b..d860acc28 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/BaseNodesTest.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/BaseNodesTest.kt
@@ -48,7 +48,7 @@ abstract class BaseNodesTest {
         var backStack: BackStack<TestRootRouter.Configuration>? = null
 
         ribsRule.start { activity, savedInstanceState ->
-            val buildParams = BuildParams<TestRootBuilder.Params>(
+            val buildParams = BuildParams(
                 payload = TestRootBuilder.Params(false),
                 buildContext = BuildContext.root(savedInstanceState),
                 identifier = Rib.Identifier(
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/PushTwoTest.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/PushTwoTest.kt
index 0138324fc..b47365616 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/PushTwoTest.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/PushTwoTest.kt
@@ -13,7 +13,7 @@ import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration.Permanent
 import com.badoo.ribs.test.util.runOnMainSync
 import org.junit.Test
 
-class PushTwoTest  : BaseNodesTest() {
+class PushTwoTest : BaseNodesTest() {
 
     private fun pushTwoConfigurations(setup: When, expectedState: ExpectedState) {
         test(setup, expectedState) { router, _ ->
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/transition/TransitionBaseNodeTest.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/transition/TransitionBaseNodeTest.kt
index 0d756c72c..1da39483f 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/transition/TransitionBaseNodeTest.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/android/lifecycle/transition/TransitionBaseNodeTest.kt
@@ -5,7 +5,7 @@ import com.badoo.ribs.routing.transition.handler.Slider
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
 import com.badoo.ribs.test.util.ribs.root.TestRootRouter
 
-open class TransitionBaseNodeTest: BaseNodesTest() {
+open class TransitionBaseNodeTest : BaseNodesTest() {
 
     override val transitionHandler: TransitionHandler<TestRootRouter.Configuration>?
         get() = Slider()
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/AndroidTestUtils.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/AndroidTestUtils.kt
index b324e88e5..e71cc1a80 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/AndroidTestUtils.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/AndroidTestUtils.kt
@@ -5,9 +5,9 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
-import java.util.concurrent.TimeoutException
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 
 private const val DEFAULT_CONDITION_TIMEOUT_MILLISECONDS = 15000L
 private const val DEFAULT_CHECK_CONDITION_FREQUENCY_MILLIS = 10L
@@ -41,9 +41,13 @@ fun <T : Activity> ActivityTestRule<T>.restartActivitySync() {
 
 fun waitForIdle(block: () -> Unit) = InstrumentationRegistry.getInstrumentation().waitForIdle(block)
 
-fun runOnMainSync(block: () -> Unit) = InstrumentationRegistry.getInstrumentation().runOnMainSync(block)
+fun runOnMainSync(block: () -> Unit) =
+    InstrumentationRegistry.getInstrumentation().runOnMainSync(block)
 
-fun waitFor(timeoutMillis: Long = DEFAULT_CONDITION_TIMEOUT_MILLISECONDS, condition: () -> Boolean) {
+fun waitFor(
+    timeoutMillis: Long = DEFAULT_CONDITION_TIMEOUT_MILLISECONDS,
+    condition: () -> Boolean
+) {
     val start = System.currentTimeMillis()
     while (!condition()) {
         if (System.currentTimeMillis() > start + timeoutMillis) {
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/FirstActivity.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/FirstActivity.kt
deleted file mode 100644
index 89489fcc8..000000000
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/FirstActivity.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.badoo.ribs.test.util
-
-import androidx.appcompat.app.AppCompatActivity
-
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/NoOpDialogLauncher.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/NoOpDialogLauncher.kt
index 1aa8956b0..9439dd9cd 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/NoOpDialogLauncher.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/NoOpDialogLauncher.kt
@@ -4,7 +4,7 @@ import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.android.dialog.DialogLauncher
 
 class NoOpDialogLauncher : DialogLauncher {
-    
+
     override fun show(dialog: Dialog<*>, onClose: () -> Unit) {
     }
 
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/RxTestUtils.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/RxTestUtils.kt
index 5adcdd165..392cc7290 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/RxTestUtils.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/RxTestUtils.kt
@@ -1,14 +1,14 @@
 package com.badoo.ribs.test.util
 
 import androidx.lifecycle.Lifecycle
-import io.reactivex.Observable
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.observers.TestObserver
 
-fun <T> Observable<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
+fun <T : Any> Observable<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
     subscribe(this)
 }
 
-class LifecycleObserver: TestObserver<Lifecycle.Event>() {
+class LifecycleObserver : TestObserver<Lifecycle.Event>() {
     fun clear() {
         values.clear()
     }
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/TestActivity.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/TestActivity.kt
index 66a1b0fea..948c17d90 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/TestActivity.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/TestActivity.kt
@@ -57,7 +57,11 @@ class TestActivity : AppCompatActivity() {
         activityBoundary.onActivityResult(requestCode, resultCode, data)
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) =
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) =
         permissionRequestBoundary.onRequestPermissionsResult(requestCode, permissions, grantResults)
 
 }
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/TestRibDialog.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/TestRibDialog.kt
index 44c585235..1b0b336f4 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/TestRibDialog.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/TestRibDialog.kt
@@ -1,8 +1,7 @@
 package com.badoo.ribs.test.util.ribs
 
-import com.badoo.ribs.android.dialog.RibFactory
 import com.badoo.ribs.android.dialog.Dialog
-
+import com.badoo.ribs.android.dialog.RibFactory
 
 class TestRibDialog(
     ribFactory: RibFactory
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/child/TestChildRouter.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/child/TestChildRouter.kt
index 4b59d416c..8891cb177 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/child/TestChildRouter.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/child/TestChildRouter.kt
@@ -1,22 +1,23 @@
 package com.badoo.ribs.test.util.ribs.child
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.core.modality.BuildParams
-import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.Routing
+import com.badoo.ribs.routing.resolution.Resolution
+import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.routing.source.impl.Empty
 import com.badoo.ribs.test.util.ribs.child.TestChildRouter.Configuration
 import kotlinx.parcelize.Parcelize
 
 class TestChildRouter(
     buildParams: BuildParams<Nothing?>
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = Empty()
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Default : Configuration()
+        @Parcelize
+        data object Default : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRoot.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRoot.kt
index 2416571b0..0ec526b18 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRoot.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRoot.kt
@@ -16,7 +16,7 @@ import com.badoo.ribs.test.util.ribs.child.TestChildView
 import com.badoo.ribs.test.util.ribs.child.builder.TestChildBuilder
 import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration
 import com.badoo.ribs.test.util.ribs.root.builder.TestRootBuilder
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 
 interface TestRoot : Rib {
 
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootInteractor.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootInteractor.kt
index 20fa919a2..70ad65072 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootInteractor.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootInteractor.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.OnLifecycleEvent
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 
 class TestRootInteractor(
     buildParams: BuildParams<*>,
diff --git a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootRouter.kt b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootRouter.kt
index 86514a8d7..115f94382 100644
--- a/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootRouter.kt
+++ b/libraries/rib-base/src/androidTest/java/com/badoo/ribs/test/util/ribs/root/TestRootRouter.kt
@@ -16,7 +16,9 @@ import com.badoo.ribs.routing.source.RoutingSource.Companion.permanent
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
 import com.badoo.ribs.test.util.ribs.TestRibDialog
 import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration
-import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration.*
+import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration.Content
+import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration.Overlay
+import com.badoo.ribs.test.util.ribs.root.TestRootRouter.Configuration.Permanent
 import kotlinx.parcelize.Parcelize
 
 class TestRootRouter(
@@ -39,38 +41,38 @@ class TestRootRouter(
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
             @Parcelize
-            object Permanent1 : Permanent()
+            data object Permanent1 : Permanent()
 
             @Parcelize
-            object Permanent2 : Permanent()
+            data object Permanent2 : Permanent()
         }
 
         sealed class Content : Configuration() {
             @Parcelize
-            object NoOp : Content()
+            data object NoOp : Content()
 
             @Parcelize
-            object AttachNode1 : Content()
+            data object AttachNode1 : Content()
 
             @Parcelize
-            object AttachNode2 : Content()
+            data object AttachNode2 : Content()
 
             @Parcelize
-            object AttachNode3 : Content()
+            data object AttachNode3 : Content()
 
             @Parcelize
-            object AttachNode1And2 : Content()
+            data object AttachNode1And2 : Content()
         }
 
         sealed class Overlay : Configuration() {
             @Parcelize
-            object AttachNode1AsOverlay : Overlay()
+            data object AttachNode1AsOverlay : Overlay()
 
             @Parcelize
-            object AttachNode2AsOverlay : Overlay()
+            data object AttachNode2AsOverlay : Overlay()
 
             @Parcelize
-            object AttachNode3AsOverlay : Overlay()
+            data object AttachNode3AsOverlay : Overlay()
         }
     }
 
@@ -86,8 +88,26 @@ class TestRootRouter(
                 child(builder1),
                 child(builder2)
             )
-            Overlay.AttachNode1AsOverlay -> showDialog(routingSource, routing.identifier, dialogLauncher, TestRibDialog(builder1))
-            Overlay.AttachNode2AsOverlay -> showDialog(routingSource, routing.identifier, dialogLauncher, TestRibDialog(builder2))
-            Overlay.AttachNode3AsOverlay -> showDialog(routingSource, routing.identifier, dialogLauncher, TestRibDialog(builder3))
+
+            Overlay.AttachNode1AsOverlay -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                TestRibDialog(builder1)
+            )
+
+            Overlay.AttachNode2AsOverlay -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                TestRibDialog(builder2)
+            )
+
+            Overlay.AttachNode3AsOverlay -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                TestRibDialog(builder3)
+            )
         }
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/activitystarter/ActivityStarter.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/activitystarter/ActivityStarter.kt
index 8e8be62e7..5f229b5c0 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/activitystarter/ActivityStarter.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/activitystarter/ActivityStarter.kt
@@ -18,7 +18,11 @@ interface ActivityStarter : RequestCodeBasedEventStream<ActivityResultEvent> {
 
     fun startActivity(createIntent: Context.() -> Intent)
 
-    fun startActivityForResult(client: RequestCodeClient, requestCode: Int, createIntent: Context.() -> Intent)
+    fun startActivityForResult(
+        client: RequestCodeClient,
+        requestCode: Int,
+        createIntent: Context.() -> Intent
+    )
 
     data class ActivityResultEvent(
         override val requestCode: Int,
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/Dialog.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/Dialog.kt
index 17b234331..5a8cc03b2 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/Dialog.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/Dialog.kt
@@ -16,6 +16,7 @@ abstract class Dialog<T : Any> private constructor(
     var title: Text? = null
     var message: Text? = null
     var cancellationPolicy: CancellationPolicy<T> = NonCancellable()
+
     @StyleRes
     var themeResId: Int? = null
     var buttons: ButtonsConfig<T>? = null
@@ -95,10 +96,10 @@ abstract class Dialog<T : Any> private constructor(
         } ?: emptyList()
 
     sealed class Event {
-        object Positive : Event()
-        object Negative : Event()
-        object Neutral : Event()
-        object Cancelled : Event()
+        data object Positive : Event()
+        data object Negative : Event()
+        data object Neutral : Event()
+        data object Cancelled : Event()
     }
 
     sealed class CancellationPolicy<T : Any> {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/DialogExtensions.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/DialogExtensions.kt
index 72a5a23f6..2fb927ed7 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/DialogExtensions.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/DialogExtensions.kt
@@ -11,29 +11,33 @@ import com.badoo.ribs.android.dialog.Dialog.CancellationPolicy.NonCancellable
 
 fun <Event : Any> Dialog<Event>.toAlertDialog(context: Context, onClose: () -> Unit): AlertDialog {
     val builder = themeResId?.let { AlertDialog.Builder(context, it) }
-            ?: AlertDialog.Builder(context)
+        ?: AlertDialog.Builder(context)
 
     return builder
-            .apply {
-                setCancelable(this@toAlertDialog, onClose)
-                setRib(this@toAlertDialog, context)
-                setTexts(this@toAlertDialog)
-                setButtons(this@toAlertDialog)
-            }
-            .create()
-            .apply {
-                markTitleAsHeading()
-                setCanceledOnTouchOutside(this@toAlertDialog)
-                setButtonClickListeners(this@toAlertDialog, onClose)
-                setOnDismissListener { this@toAlertDialog.rib = null }
-            }
+        .apply {
+            setCancelable(this@toAlertDialog, onClose)
+            setRib(this@toAlertDialog, context)
+            setTexts(this@toAlertDialog)
+            setButtons(this@toAlertDialog)
+        }
+        .create()
+        .apply {
+            markTitleAsHeading()
+            setCanceledOnTouchOutside(this@toAlertDialog)
+            setButtonClickListeners(this@toAlertDialog, onClose)
+            setOnDismissListener { this@toAlertDialog.rib = null }
+        }
 }
 
-private fun <Event : Any> AlertDialog.Builder.setCancelable(dialog: Dialog<Event>, onClose: () -> Unit) {
+private fun <Event : Any> AlertDialog.Builder.setCancelable(
+    dialog: Dialog<Event>,
+    onClose: () -> Unit
+) {
     when (val policy = dialog.cancellationPolicy) {
         is NonCancellable -> {
             setCancelable(false)
         }
+
         is Cancellable -> {
             setCancelable(true)
             setOnCancelListener {
@@ -97,14 +101,32 @@ private fun AlertDialog.Builder.setButtons(dialog: Dialog<*>) {
     }
 }
 
-private fun <Event : Any> AlertDialog.setButtonClickListeners(dialog: Dialog<Event>, onClose: () -> Unit) {
+private fun <Event : Any> AlertDialog.setButtonClickListeners(
+    dialog: Dialog<Event>,
+    onClose: () -> Unit
+) {
     // Workaround so that pressing button will not close dialog automatically. Let business
     // logic decide what to do instead.
     setOnShowListener {
         (it as? AlertDialog)?.apply {
-            configureButtonClick(AlertDialog.BUTTON_POSITIVE, dialog, dialog.buttons?.positive, onClose)
-            configureButtonClick(AlertDialog.BUTTON_NEGATIVE, dialog, dialog.buttons?.negative, onClose)
-            configureButtonClick(AlertDialog.BUTTON_NEUTRAL, dialog, dialog.buttons?.neutral, onClose)
+            configureButtonClick(
+                AlertDialog.BUTTON_POSITIVE,
+                dialog,
+                dialog.buttons?.positive,
+                onClose
+            )
+            configureButtonClick(
+                AlertDialog.BUTTON_NEGATIVE,
+                dialog,
+                dialog.buttons?.negative,
+                onClose
+            )
+            configureButtonClick(
+                AlertDialog.BUTTON_NEUTRAL,
+                dialog,
+                dialog.buttons?.neutral,
+                onClose
+            )
         }
     }
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/routing/resolution/DialogResolution.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/routing/resolution/DialogResolution.kt
index 690164e25..f1421ae16 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/routing/resolution/DialogResolution.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/dialog/routing/resolution/DialogResolution.kt
@@ -18,7 +18,7 @@ class DialogResolution<Event : Any, C : Parcelable>(
 
     override val numberOfNodes: Int = 1
 
-    override fun buildNodes(buildContexts: List<BuildContext>) : List<Rib> =
+    override fun buildNodes(buildContexts: List<BuildContext>): List<Rib> =
         dialog.buildNodes(buildContexts.first())
 
     override fun execute() {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/integrationpoint/IntegrationPoint.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/integrationpoint/IntegrationPoint.kt
index 3c4f21427..60ceb756d 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/integrationpoint/IntegrationPoint.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/integrationpoint/IntegrationPoint.kt
@@ -3,7 +3,6 @@ package com.badoo.ribs.android.integrationpoint
 import android.os.Bundle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
 import com.badoo.ribs.android.activitystarter.ActivityStarter
 import com.badoo.ribs.android.dialog.DialogLauncher
 import com.badoo.ribs.android.permissionrequester.PermissionRequester
@@ -54,12 +53,12 @@ abstract class IntegrationPoint(
             onStop = ::onStop,
             onDestroy = ::onDestroy
         )
-        viewLifecycleOwner.observe(lifecycleOwner, Observer { viewLifecycle ->
+        viewLifecycleOwner.observe(lifecycleOwner) { viewLifecycle ->
             viewLifecycle.lifecycle.subscribe(
                 onCreate = ::onViewCreate,
                 onDestroy = ::onViewDestroy
             )
-        })
+        }
     }
 
     private fun onCreate() {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequester.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequester.kt
index 85689e71a..170dd7d32 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequester.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequester.kt
@@ -8,7 +8,10 @@ import com.badoo.ribs.android.requestcode.RequestCodeClient
 interface PermissionRequester :
     RequestCodeBasedEventStream<RequestPermissionsEvent> {
 
-    fun checkPermissions(client: RequestCodeClient, permissions: Array<String>) : CheckPermissionsResult
+    fun checkPermissions(
+        client: RequestCodeClient,
+        permissions: Array<String>
+    ): CheckPermissionsResult
 
     fun requestPermissions(client: RequestCodeClient, requestCode: Int, permissions: Array<String>)
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequesterHost.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequesterHost.kt
index 834c2716e..4fa8a353e 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequesterHost.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/permissionrequester/PermissionRequesterHost.kt
@@ -17,7 +17,10 @@ interface PermissionRequesterHost {
     class ActivityHost(private val activity: Activity) : PermissionRequesterHost {
 
         override fun isGranted(permission: String): Boolean =
-            ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_GRANTED
+            ContextCompat.checkSelfPermission(
+                activity,
+                permission
+            ) == PackageManager.PERMISSION_GRANTED
 
         override fun shouldShowRationale(permission: String): Boolean =
             ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)
@@ -31,7 +34,10 @@ interface PermissionRequesterHost {
     class FragmentHost(private val fragment: Fragment) : PermissionRequesterHost {
 
         override fun isGranted(permission: String): Boolean =
-            ContextCompat.checkSelfPermission(fragment.requireContext(), permission) == PackageManager.PERMISSION_GRANTED
+            ContextCompat.checkSelfPermission(
+                fragment.requireContext(),
+                permission
+            ) == PackageManager.PERMISSION_GRANTED
 
         override fun shouldShowRationale(permission: String): Boolean =
             fragment.shouldShowRequestPermissionRationale(permission)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImpl.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImpl.kt
index 518af7019..5053aaebe 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImpl.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImpl.kt
@@ -35,7 +35,12 @@ abstract class RequestCodeBasedEventStreamImpl<T : RequestCodeBasedEvent>(
         val internalRequestCode = externalRequestCode.toInternalRequestCode()
 
         ensureSubject(id) {
-            RIBs.errorHandler.handleNoRequestCodeListenersError(externalRequestCode, internalRequestCode, id, event)
+            RIBs.errorHandler.handleNoRequestCodeListenersError(
+                externalRequestCode,
+                internalRequestCode,
+                id,
+                event
+            )
         }
 
         events.getValue(id).emit(event)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeDoesntFitInMask.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeDoesntFitInMask.kt
index 35056e736..fa6d706fc 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeDoesntFitInMask.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeDoesntFitInMask.kt
@@ -1,5 +1,3 @@
 package com.badoo.ribs.android.requestcode
 
-import java.lang.RuntimeException
-
 class RequestCodeDoesntFitInMask(override val message: String?) : RuntimeException(message)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeRegistry.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeRegistry.kt
index 3962bf0b2..b8e2eb1bf 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeRegistry.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/requestcode/RequestCodeRegistry.kt
@@ -1,7 +1,6 @@
 package com.badoo.ribs.android.requestcode
 
 import android.os.Bundle
-import java.util.*
 import kotlin.math.pow
 
 /**
@@ -16,12 +15,13 @@ import kotlin.math.pow
  * components. Instead, use sensible numbers starting from 1, only unique locally to your component,
  * and let this class do the rest to ensure global uniqueness.
  */
-class RequestCodeRegistry constructor(
+class RequestCodeRegistry(
     initialState: Bundle?,
     private val nbLowerBitsForIds: Int = 4
 ) {
     internal val requestCodes: HashMap<Int, String> =
-        (initialState?.getSerializable(KEY_REQUEST_CODE_REGISTRY) as? HashMap<Int, String>) ?: hashMapOf()
+        (initialState?.getSerializable(KEY_REQUEST_CODE_REGISTRY) as? HashMap<Int, String>)
+            ?: hashMapOf()
 
     private val lowerBitsShift: Int = nbLowerBitsForIds - 0
     private val maskLowerBits = (1 shl lowerBitsShift) - 1
@@ -58,7 +58,11 @@ class RequestCodeRegistry constructor(
     private fun ensureCodeIsCorrect(code: Int) {
         if (code < 1 || code != code and maskLowerBits) {
             throw RequestCodeDoesntFitInMask(
-                "Requestcode '$code' does not fit requirements. Allowed min: 1, max: ${2.0.pow(nbLowerBitsForIds).toInt() - 1}"
+                "Requestcode '$code' does not fit requirements. Allowed min: 1, max: ${
+                    2.0.pow(
+                        nbLowerBitsForIds
+                    ).toInt() - 1
+                }"
             )
         }
     }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/android/text/Text.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/android/text/Text.kt
index a93b3ae2e..e0c85076f 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/android/text/Text.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/android/text/Text.kt
@@ -11,7 +11,7 @@ interface Text {
 
     fun resolve(context: Context): CharSequence
 
-    class Plain(private val string: String): Text {
+    class Plain(private val string: String) : Text {
         override fun resolve(context: Context): CharSequence =
             string
     }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index d376112ba..42c5109b7 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -101,7 +101,9 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
         }
 
     val plugins: List<Plugin> =
-        buildContext.defaultPlugins(this) + RIBs.globalPlugins + plugins + if (this is Plugin) listOf(this) else emptyList()
+        buildContext.defaultPlugins(this) + RIBs.globalPlugins + plugins + if (this is Plugin) listOf(
+            this
+        ) else emptyList()
 
     internal open val activationMode: ActivationMode =
         buildContext.activationMode
@@ -414,7 +416,7 @@ open class Node<V : RibView> @VisibleForTesting internal constructor(
     override val lifecycle: Lifecycle
         get() = lifecycleManager.lifecycle
 
-    fun getView() : V? = view
+    fun getView(): V? = view
 
     fun <P> plugins(pClass: Class<P>): List<P> =
         plugins.filterIsInstance(pClass)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildContext.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildContext.kt
index e5ce2607c..eee7539b4 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildContext.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildContext.kt
@@ -1,5 +1,3 @@
-
-
 package com.badoo.ribs.core.modality
 
 import android.os.Bundle
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildParams.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildParams.kt
index 01e763bcc..fe62e96dd 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildParams.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/core/modality/BuildParams.kt
@@ -6,7 +6,6 @@ import com.badoo.ribs.core.Rib.Identifier.Companion.KEY_UUID
 import com.badoo.ribs.core.customisation.RibCustomisation
 import java.util.UUID
 
-
 /**
  * Represents information passed to components.
  *
@@ -25,7 +24,7 @@ class BuildParams<T>(
     val savedInstanceState: Bundle?
         get() = buildContext.savedInstanceState
 
-    fun <T : RibCustomisation> getOrDefault(defaultCustomisation: T) : T =
+    fun <T : RibCustomisation> getOrDefault(defaultCustomisation: T): T =
         buildContext.customisations.getRecursivelyOrDefault(defaultCustomisation)
 
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/NodeAwareImpl.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/NodeAwareImpl.kt
index 38eacebe9..a1e0b0355 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/NodeAwareImpl.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/NodeAwareImpl.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.core.plugin
 
 import com.badoo.ribs.core.Node
 
-class NodeAwareImpl: NodeAware {
+class NodeAwareImpl : NodeAware {
     override lateinit var node: Node<*>
         private set
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/RibAwareImpl.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/RibAwareImpl.kt
index 4dd859fe6..63a97fb1f 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/RibAwareImpl.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/core/plugin/RibAwareImpl.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.core.plugin
 
 import com.badoo.ribs.core.Rib
 
-class RibAwareImpl<T : Rib>: RibAware<T> {
+class RibAwareImpl<T : Rib> : RibAware<T> {
     override lateinit var rib: T
         private set
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Cancellable.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Cancellable.kt
index c975dd0ba..0db1a7637 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Cancellable.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Cancellable.kt
@@ -13,6 +13,6 @@ interface Cancellable {
     }
 
     object Empty : Cancellable {
-        override fun cancel() { }
+        override fun cancel() {}
     }
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Operators.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Operators.kt
index 0fced276c..9aa88db4f 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Operators.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/minimal/reactive/Operators.kt
@@ -9,10 +9,17 @@ fun <T> just(producer: () -> T): Source<T> =
     }
 
 @Suppress("UNCHECKED_CAST")
-fun <A : Any, B : Any, C> combineLatest(source1: Source<A>, source2: Source<B>, combination: (A, B) -> C): Source<C> =
+fun <A : Any, B : Any, C> combineLatest(
+    source1: Source<A>,
+    source2: Source<B>,
+    combination: (A, B) -> C
+): Source<C> =
     combineLatest(listOf(source1, source2)) { array -> combination(array[0] as A, array[1] as B) }
 
-fun <C> combineLatest(sources: Collection<Source<Any>>, combination: (Array<Any?>) -> C): Source<C> =
+fun <C> combineLatest(
+    sources: Collection<Source<Any>>,
+    combination: (Array<Any?>) -> C
+): Source<C> =
     object : Source<C> {
         /**
          * The internal state (first / second values) should be recreated for each new call to observer
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/Routing.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/Routing.kt
index d03c23fd8..6fbeeaebe 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/Routing.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/Routing.kt
@@ -4,7 +4,6 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import java.io.Serializable
 
-
 @Parcelize
 data class Routing<C : Parcelable>(
     val configuration: C,
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/history/RoutingHistoryDiffer.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/history/RoutingHistoryDiffer.kt
index be64780c7..8ab4cee4d 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/history/RoutingHistoryDiffer.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/history/RoutingHistoryDiffer.kt
@@ -11,7 +11,6 @@ import com.badoo.ribs.routing.state.changeset.RoutingCommand.Add
 import com.badoo.ribs.routing.state.changeset.RoutingCommand.Deactivate
 import com.badoo.ribs.routing.state.changeset.RoutingCommand.Remove
 
-
 internal object RoutingHistoryDiffer {
 
     /**
@@ -29,19 +28,19 @@ internal object RoutingHistoryDiffer {
                 val previousIds = previous.map { it.routing.identifier }
                 val currentIds = current.map { it.routing.identifier }
 
-                previousIds.minus(currentIds).reversed().forEach { identifier ->
+                previousIds.minus(currentIds.toSet()).reversed().forEach { identifier ->
                     val toRemove = previous.find(identifier)!!
                     commands += if (toRemove.activation == ACTIVE) toRemove.deactivate() else emptySet()
                     commands += toRemove.remove()
                 }
 
-                currentIds.minus(previousIds).forEach { identifier ->
+                currentIds.minus(previousIds.toSet()).forEach { identifier ->
                     val toAdd = current.find(identifier)!!
                     commands += toAdd.add()
                     commands += if (toAdd.activation == ACTIVE) toAdd.activate() else emptySet()
                 }
 
-                currentIds.intersect(previousIds).forEach { identifier ->
+                currentIds.intersect(previousIds.toSet()).forEach { identifier ->
                     val t0 = previous.find { it.routing.identifier == identifier }!!
                     val t1 = current.find { it.routing.identifier == identifier }!!
                     commands += diff(t0, t1)
@@ -82,7 +81,10 @@ internal object RoutingHistoryDiffer {
         return commands
     }
 
-    private fun <C : Parcelable> diff(t0: RoutingHistoryElement<C>, t1: RoutingHistoryElement<C>): Set<RoutingCommand<C>> {
+    private fun <C : Parcelable> diff(
+        t0: RoutingHistoryElement<C>,
+        t1: RoutingHistoryElement<C>
+    ): Set<RoutingCommand<C>> {
         val commands = mutableSetOf<RoutingCommand<C>>()
 
         commands += diffActivationChange(t0, t1)
@@ -92,7 +94,10 @@ internal object RoutingHistoryDiffer {
         return commands
     }
 
-    private fun <C : Parcelable> diffActivationChange(t0: RoutingHistoryElement<C>, t1: RoutingHistoryElement<C>): Set<RoutingCommand<C>> {
+    private fun <C : Parcelable> diffActivationChange(
+        t0: RoutingHistoryElement<C>,
+        t1: RoutingHistoryElement<C>
+    ): Set<RoutingCommand<C>> {
         val commands = mutableSetOf<RoutingCommand<C>>()
 
         if (t1.activation != t0.activation) {
@@ -106,7 +111,10 @@ internal object RoutingHistoryDiffer {
         return commands
     }
 
-    private fun <C : Parcelable> diffMetaChange(t0: RoutingHistoryElement<C>, t1: RoutingHistoryElement<C>): Set<RoutingCommand<C>> {
+    private fun <C : Parcelable> diffMetaChange(
+        t0: RoutingHistoryElement<C>,
+        t1: RoutingHistoryElement<C>
+    ): Set<RoutingCommand<C>> {
         val commands = mutableSetOf<RoutingCommand<C>>()
 
         if (t1.routing.meta != t0.routing.meta) {
@@ -116,16 +124,19 @@ internal object RoutingHistoryDiffer {
         return commands
     }
 
-    private fun <C : Parcelable> diffOverlayChange(t0: RoutingHistoryElement<C>, t1: RoutingHistoryElement<C>): Set<RoutingCommand<C>> {
+    private fun <C : Parcelable> diffOverlayChange(
+        t0: RoutingHistoryElement<C>,
+        t1: RoutingHistoryElement<C>
+    ): Set<RoutingCommand<C>> {
         val commands = mutableSetOf<RoutingCommand<C>>()
 
         if (t1.overlays != t0.overlays) {
-            t0.overlays.minus(t1.overlays).forEach { overlay ->
+            t0.overlays.minus(t1.overlays.toSet()).forEach { overlay ->
                 if (t0.activation == ACTIVE) commands += Deactivate(overlay)
                 commands += Remove(overlay)
             }
 
-            t1.overlays.minus(t0.overlays).forEach { overlay ->
+            t1.overlays.minus(t0.overlays.toSet()).forEach { overlay ->
                 commands += Add(overlay)
                 if (t0.activation == ACTIVE) commands += Activate(overlay)
             }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/resolver/RoutingResolver.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/resolver/RoutingResolver.kt
index 373df522c..9db88fa36 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/resolver/RoutingResolver.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/resolver/RoutingResolver.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.routing.resolver
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.Routing
+import com.badoo.ribs.routing.resolution.Resolution
 
 interface RoutingResolver<C : Parcelable> {
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/Router.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/Router.kt
index 0dff24ecb..a2d35bc39 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/Router.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/Router.kt
@@ -14,8 +14,8 @@ import com.badoo.ribs.core.plugin.ViewLifecycleAware
 import com.badoo.ribs.minimal.reactive.CompositeCancellable
 import com.badoo.ribs.minimal.reactive.Relay
 import com.badoo.ribs.minimal.reactive.Source
-import com.badoo.ribs.minimal.state.TimeCapsule
 import com.badoo.ribs.minimal.reactive.map
+import com.badoo.ribs.minimal.state.TimeCapsule
 import com.badoo.ribs.routing.activator.ChildActivator
 import com.badoo.ribs.routing.activator.RoutingActivator
 import com.badoo.ribs.routing.activator.UnhandledChildActivator
@@ -55,10 +55,10 @@ abstract class Router<C : Parcelable>(
 
     private val transitionStatesRelay: Relay<TransitionState> = Relay()
     val transitionStates: Source<TransitionState> = transitionStatesRelay
-    
+
     private val cancellable = CompositeCancellable()
     private val timeCapsule: TimeCapsule = TimeCapsule(buildParams.savedInstanceState)
-    private val hasSavedState: Boolean  = buildParams.savedInstanceState != null
+    private val hasSavedState: Boolean = buildParams.savedInstanceState != null
 
     private lateinit var routingStatePool: RoutingStatePool<C>
     override lateinit var node: Node<*>
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/RouterByDelegate.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/RouterByDelegate.kt
index 73c289ba2..cf80ad7e7 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/RouterByDelegate.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/router/RouterByDelegate.kt
@@ -12,7 +12,7 @@ class RouterByDelegate<T : Parcelable>(
     routingSource: RoutingSource<T>,
     private val resolver: RoutingResolver<T>,
     clientChildActivator: ChildActivator<T> = UnhandledChildActivator()
-): Router<T>(
+) : Router<T>(
     buildParams = buildParams,
     routingSource = routingSource,
     clientChildActivator = clientChildActivator
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/RoutingSourceDiffer.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/RoutingSourceDiffer.kt
index 54edca66f..54bfb7e26 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/RoutingSourceDiffer.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/RoutingSourceDiffer.kt
@@ -58,7 +58,8 @@ internal fun <C : Parcelable> RoutingHistory<C>.ensureUniqueIds() {
     forEach { element ->
         if (ids.contains(element.routing.identifier)) {
             val errorMessage = "Non-unique content id found: ${element.routing.identifier}"
-            RIBs.errorHandler.handleNonFatalError(errorMessage,
+            RIBs.errorHandler.handleNonFatalError(
+                errorMessage,
                 NonUniqueRoutingIdentifierException(
                     errorMessage
                 )
@@ -69,7 +70,8 @@ internal fun <C : Parcelable> RoutingHistory<C>.ensureUniqueIds() {
         element.overlays.forEach { overlay ->
             if (ids.contains(overlay.identifier)) {
                 val errorMessage = "Non-unique overlay id found: ${overlay.identifier}"
-                RIBs.errorHandler.handleNonFatalError(errorMessage,
+                RIBs.errorHandler.handleNonFatalError(
+                    errorMessage,
                     NonUniqueRoutingIdentifierException(
                         errorMessage
                     )
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/Ext.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/Ext.kt
index 19ee48ecc..1ebf698f9 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/Ext.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/Ext.kt
@@ -3,10 +3,17 @@ package com.badoo.ribs.routing.source.backstack
 import android.os.Parcelable
 import com.badoo.ribs.routing.Routing
 
-
-internal fun <C : Parcelable> BackStack.State<C>.contentIdForPosition(position: Int, content: C): Routing.Identifier =
+internal fun <C : Parcelable> BackStack.State<C>.contentIdForPosition(
+    position: Int,
+    content: C
+): Routing.Identifier =
     Routing.Identifier("Back stack $id #$position = $content")
 
 @SuppressWarnings("LongParameterList")
-internal fun <C : Parcelable> BackStack.State<C>.overlayIdForPosition(position: Int, content: C, overlayIndex: Int, overlay: C): Routing.Identifier =
+internal fun <C : Parcelable> BackStack.State<C>.overlayIdForPosition(
+    position: Int,
+    content: C,
+    overlayIndex: Int,
+    overlay: C
+): Routing.Identifier =
     Routing.Identifier("Back stack $id overlay #$position.$overlayIndex = $content.$overlay")
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/NewRoot.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/NewRoot.kt
index 404d59ce7..b46cba95a 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/NewRoot.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/NewRoot.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 data class NewRoot<C : Parcelable>(
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Pop.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Pop.kt
index 97de7b16e..4096bdc4e 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Pop.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Pop.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 /**
@@ -21,6 +21,7 @@ class Pop<C : Parcelable> : BackStack.Operation<C> {
                         overlays = elements.last().overlays.dropLast(1)
                     )
                 )
+
             elements.canPopContent -> elements.dropLast(1)
             else -> elements
         }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Push.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Push.kt
index fa5d37299..cf579ed91 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Push.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Push.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 /**
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/PushOverlay.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/PushOverlay.kt
index d4cba5757..42bfb33c2 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/PushOverlay.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/PushOverlay.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 /**
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Remove.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Remove.kt
index 9a1772e32..681852294 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Remove.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Remove.kt
@@ -2,8 +2,8 @@ package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
 import com.badoo.ribs.routing.Routing
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 /**
@@ -17,7 +17,7 @@ class Remove<C : Parcelable>(
 
     override fun isApplicable(elements: Elements<C>): Boolean =
         elements.hasContentWithIdentifier() ||
-        elements.hasOverlayWithIdentifier()
+                elements.hasOverlayWithIdentifier()
 
     private fun Elements<C>.hasContentWithIdentifier() =
         find { it.routing.identifier == identifier } != null
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Replace.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Replace.kt
index 85e993bf4..395d55395 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Replace.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/backstack/operation/Replace.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.routing.source.backstack.operation
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
+import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.Elements
 
 /**
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Combined.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Combined.kt
index 62c45f0e6..559291532 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Combined.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Combined.kt
@@ -18,7 +18,7 @@ internal data class Combined<C : Parcelable>(
     data class CombinedHistory<C : Parcelable>(
         val first: RoutingHistory<C>,
         val second: RoutingHistory<C>
-    ): RoutingHistory<C> {
+    ) : RoutingHistory<C> {
 
         override fun iterator(): Iterator<RoutingHistoryElement<C>> =
             ConcatIterator(first.iterator()) + second.iterator()
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Pool.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Pool.kt
index 1a25ed7a1..af2e061d5 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Pool.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/source/impl/Pool.kt
@@ -25,7 +25,8 @@ class Pool<C : Parcelable>(
         val elements: Map<Routing.Identifier, RoutingHistoryElement<C>> = emptyMap()
     ) : Parcelable
 
-    private var elements: Map<Routing.Identifier, RoutingHistoryElement<C>> = HashMap(timeCapsule.elements())
+    private var elements: Map<Routing.Identifier, RoutingHistoryElement<C>> =
+        HashMap(timeCapsule.elements())
     private val current: RoutingHistory<C>
         get() = RoutingHistory.from(
             elements.values.toList()
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/TransactionExecutionParams.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/TransactionExecutionParams.kt
index 681816ff6..a9958e3af 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/TransactionExecutionParams.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/TransactionExecutionParams.kt
@@ -2,10 +2,10 @@ package com.badoo.ribs.routing.state.action
 
 import android.os.Parcelable
 import com.badoo.ribs.core.Node
+import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.activator.RoutingActivator
 import com.badoo.ribs.routing.state.RoutingContext
 import com.badoo.ribs.routing.state.feature.EffectEmitter
-import com.badoo.ribs.routing.Routing
 
 /**
  * Helper class for action execution.
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/multi/PoolAction.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/multi/PoolAction.kt
index 9ffacba12..dc9f34d2e 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/multi/PoolAction.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/multi/PoolAction.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.routing.state.action.multi
 
 import android.os.Parcelable
+import com.badoo.ribs.routing.Routing
+import com.badoo.ribs.routing.state.Pool
 import com.badoo.ribs.routing.state.RoutingContext
 import com.badoo.ribs.routing.state.RoutingContext.Resolved
 import com.badoo.ribs.routing.state.action.TransactionExecutionParams
-import com.badoo.ribs.routing.state.Pool
 import com.badoo.ribs.routing.state.feature.state.WorkingState
-import com.badoo.ribs.routing.Routing
 
 /**
  * Represents an action that affects multiple [Routing] elements in the pool when executed.
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/DeactivateAction.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/DeactivateAction.kt
index 879da6431..603433b6d 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/DeactivateAction.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/DeactivateAction.kt
@@ -3,8 +3,8 @@ package com.badoo.ribs.routing.state.action.single
 import android.os.Parcelable
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.routing.Routing
-import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.activator.RoutingActivator
+import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.state.RoutingContext.ActivationState
 import com.badoo.ribs.routing.state.RoutingContext.ActivationState.INACTIVE
 import com.badoo.ribs.routing.state.RoutingContext.Resolved
@@ -30,7 +30,7 @@ internal class DeactivateAction<C : Parcelable>(
     private val targetActivationState: ActivationState = INACTIVE
 ) : RoutingTransitionAction<C> {
 
-    object Factory: ActionFactory {
+    object Factory : ActionFactory {
         override fun <C : Parcelable> create(
             params: ActionExecutionParams<C>
         ): RoutingTransitionAction<C> = DeactivateAction(
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/RemoveAction.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/RemoveAction.kt
index 8785530e9..efc7a614c 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/RemoveAction.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/action/single/RemoveAction.kt
@@ -21,7 +21,7 @@ internal class RemoveAction<C : Parcelable>(
     private val activator: RoutingActivator<C>
 ) : RoutingTransitionAction<C> {
 
-    object Factory: ActionFactory {
+    object Factory : ActionFactory {
         override fun <C : Parcelable> create(params: ActionExecutionParams<C>): RoutingTransitionAction<C> =
             RemoveAction(
                 emitter = params.transactionExecutionParams.emitter,
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/changeset/RoutingCommand.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/changeset/RoutingCommand.kt
index c23c38882..af3adcdc2 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/changeset/RoutingCommand.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/changeset/RoutingCommand.kt
@@ -2,6 +2,7 @@ package com.badoo.ribs.routing.state.changeset
 
 import android.os.Parcelable
 import com.badoo.ribs.core.Node
+import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.state.action.single.ActionFactory
 import com.badoo.ribs.routing.state.action.single.ActivateAction
@@ -10,7 +11,6 @@ import com.badoo.ribs.routing.state.action.single.DeactivateAction
 import com.badoo.ribs.routing.state.action.single.RemoveAction
 import com.badoo.ribs.routing.state.action.single.ReversibleActionFactory
 import com.badoo.ribs.routing.state.action.single.ReversibleActionPair
-import com.badoo.ribs.routing.Routing
 
 /**
  * Represents a command to change one or more [RoutingContext] elements.
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/CommandExecutionException.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/CommandExecutionException.kt
index 90a76538f..7c7090557 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/CommandExecutionException.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/CommandExecutionException.kt
@@ -1,5 +1,4 @@
 package com.badoo.ribs.routing.state.exception
 
 class CommandExecutionException(message: String?, cause: Throwable?) :
-    IllegalStateException(message, cause) {
-}
+    IllegalStateException(message, cause)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/KeyNotFoundInPoolException.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/KeyNotFoundInPoolException.kt
index 1cd904ce3..f39efad32 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/KeyNotFoundInPoolException.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/exception/KeyNotFoundInPoolException.kt
@@ -7,5 +7,4 @@ class KeyNotFoundInPoolException internal constructor(
     pool: Any
 ) : IllegalStateException(
     "Key $key was not found in pool: $pool"
-) {
-}
+)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/Actor.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/Actor.kt
index 6c2e3bbe0..cde17d066 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/Actor.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/Actor.kt
@@ -53,7 +53,10 @@ internal class Actor<C : Parcelable>(
         state: WorkingState<C>,
         transaction: PoolCommand<C>
     ) {
-        transaction.action.execute(state, createParams(effectEmitter, state, emptyMap(), transaction))
+        transaction.action.execute(
+            state,
+            createParams(effectEmitter, state, emptyMap(), transaction)
+        )
     }
 
     private enum class NewTransitionsExecution {
@@ -101,6 +104,7 @@ internal class Actor<C : Parcelable>(
                     it.reverse()
                     return NewTransitionsExecution.ABORT
                 }
+
                 transaction.descriptor.isContinuationOf(it.descriptor) -> {
                     it.jumpToEnd()
                 }
@@ -118,6 +122,7 @@ internal class Actor<C : Parcelable>(
                 transaction.descriptor.isReverseOf(pendingTransition.descriptor) -> {
                     pendingTransition.discard()
                 }
+
                 transaction.descriptor.isContinuationOf(pendingTransition.descriptor) -> {
                     pendingTransition.completeWithoutTransition()
                 }
@@ -152,7 +157,10 @@ internal class Actor<C : Parcelable>(
         val defaultElements: MutablePool<C> = mutablePoolOf()
 
         commands.forEach { command ->
-            if (command is RoutingCommand.Add<C> && !state.pool.containsKey(command.routing) && !defaultElements.containsKey(command.routing)) {
+            if (command is RoutingCommand.Add<C> && !state.pool.containsKey(command.routing) && !defaultElements.containsKey(
+                    command.routing
+                )
+            ) {
                 defaultElements[command.routing] = RoutingContext.Unresolved(
                     activationState = RoutingContext.ActivationState.INACTIVE,
                     routing = command.routing
@@ -177,7 +185,11 @@ internal class Actor<C : Parcelable>(
                 val lookup = tempPool[key]
                 if (lookup is RoutingContext.Resolved) lookup
                 else {
-                    val item = defaultElements[key] ?: state.pool[key] ?: throw KeyNotFoundInPoolException(key, state.pool)
+                    val item =
+                        defaultElements[key] ?: state.pool[key] ?: throw KeyNotFoundInPoolException(
+                            key,
+                            state.pool
+                        )
                     val resolved = item.resolve(resolver, parentNode)
                     tempPool[key] = resolved
                     resolved
@@ -213,7 +225,10 @@ internal class Actor<C : Parcelable>(
         }
     }
 
-    private fun processInternalTransaction(state: WorkingState<C>, internalTransaction: InternalTransaction<C>) {
+    private fun processInternalTransaction(
+        state: WorkingState<C>,
+        internalTransaction: InternalTransaction<C>
+    ) {
         val params = createParams(
             emitter = effectEmitter,
             state = state,
@@ -222,15 +237,28 @@ internal class Actor<C : Parcelable>(
         )
 
         when (internalTransaction) {
-            is ExecutePendingTransition -> consumeTransition(state, internalTransaction.pendingTransition, params)
+            is ExecutePendingTransition -> consumeTransition(
+                state,
+                internalTransaction.pendingTransition,
+                params
+            )
         }
     }
 
-    private fun consumeTransition(state: WorkingState<C>, pendingTransition: PendingTransition<C>, params: TransactionExecutionParams<C>) {
+    private fun consumeTransition(
+        state: WorkingState<C>,
+        pendingTransition: PendingTransition<C>,
+        params: TransactionExecutionParams<C>
+    ) {
         val isScheduled = pendingTransition.isScheduled(state)
         val canTransition = canTransition(params)
         when {
-            isScheduled && canTransition -> pendingTransition.execute(requireNotNull(transitionHandler)).start()
+            isScheduled && canTransition -> pendingTransition.execute(
+                requireNotNull(
+                    transitionHandler
+                )
+            ).start()
+
             isScheduled && !canTransition -> pendingTransition.completeWithoutTransition()
             else -> pendingTransition.discard()
         }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/PendingTransition.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/PendingTransition.kt
index 525729797..5142c97c7 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/PendingTransition.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/PendingTransition.kt
@@ -31,7 +31,11 @@ internal class PendingTransition<C : Parcelable>(
          */
         hideEnteringElements()
         handler.post {
-            internalTransactionConsumer.invoke(Transaction.InternalTransaction.ExecutePendingTransition(this))
+            internalTransactionConsumer.invoke(
+                Transaction.InternalTransaction.ExecutePendingTransition(
+                    this
+                )
+            )
         }
     }
 
@@ -73,12 +77,14 @@ internal class PendingTransition<C : Parcelable>(
     }
 
     private fun hideEnteringElements() {
-        val enteringElements = transitionElements.filter { it.direction == TransitionDirection.ENTER }
+        val enteringElements =
+            transitionElements.filter { it.direction == TransitionDirection.ENTER }
         enteringElements.visibility(View.INVISIBLE)
     }
 
     private fun showEnteringElements() {
-        val enteringElements = transitionElements.filter { it.direction == TransitionDirection.ENTER }
+        val enteringElements =
+            transitionElements.filter { it.direction == TransitionDirection.ENTER }
         enteringElements.visibility(View.VISIBLE)
     }
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/RoutingStatePool.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/RoutingStatePool.kt
index 0be96ab32..d365be109 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/RoutingStatePool.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/state/feature/RoutingStatePool.kt
@@ -40,7 +40,7 @@ internal open class RoutingStatePool<C : Parcelable>(
     activator: RoutingActivator<C>,
     parentNode: Node<*>,
     transitionHandler: TransitionHandler<C>?
-) : AsyncStore<Effect<C>, WorkingState<C>>(initialState = timeCapsule.initialState<C>()) {
+) : AsyncStore<Effect<C>, WorkingState<C>>(initialState = timeCapsule.initialState()) {
 
     private val actor = Actor(
         resolver = resolver,
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/Transition.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/Transition.kt
index 77e1c3873..23542fdc4 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/Transition.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/Transition.kt
@@ -11,7 +11,7 @@ interface Transition {
     fun start()
 
     fun end()
-    
+
     fun reverse()
 
     companion object {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/fade/Fade.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/fade/Fade.kt
index f4a29fd7f..a445bfe5f 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/fade/Fade.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/fade/Fade.kt
@@ -18,7 +18,7 @@ import kotlin.math.abs
 fun <T> TransitionElement<out T>.fade(
     duration: Long = defaultDuration,
     interpolator: Interpolator = defaultInterpolator
-) : Transition {
+): Transition {
 
     val evaluator = SingleProgressEvaluator()
     progressEvaluator.add(evaluator)
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/helper/AnimationContainer.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/helper/AnimationContainer.kt
index 5e2f04ded..5c7cbc775 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/helper/AnimationContainer.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/helper/AnimationContainer.kt
@@ -4,8 +4,8 @@ import android.view.View
 import android.view.ViewGroup
 
 sealed class AnimationContainer {
-    object RootView : AnimationContainer()
-    object Parent : AnimationContainer()
+    data object RootView : AnimationContainer()
+    data object Parent : AnimationContainer()
     data class FindParentById(val id: Int) : AnimationContainer()
 }
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/Slide.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/Slide.kt
index d97ec7049..bd49d3725 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/Slide.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/Slide.kt
@@ -1,4 +1,5 @@
 @file:SuppressWarnings("LongParameterList")
+
 package com.badoo.ribs.routing.transition.effect.slide
 
 import android.view.animation.Interpolator
@@ -14,7 +15,6 @@ import com.badoo.ribs.routing.transition.handler.defaultDuration
 import com.badoo.ribs.routing.transition.handler.defaultInterpolator
 import com.badoo.ribs.routing.transition.progress.SingleProgressEvaluator
 
-
 @CheckResult
 fun <T> TransitionElement<out T>.slide(
     gravity: Gravity,
@@ -22,9 +22,10 @@ fun <T> TransitionElement<out T>.slide(
     duration: Long = defaultDuration,
     interpolator: Interpolator = defaultInterpolator,
     reverseWhenAddedOrRemoved: Boolean = true
-) : Transition {
+): Transition {
     val evaluator = SingleProgressEvaluator().also { progressEvaluator.add(it) }
-    val actualGravity = if (reverseWhenAddedOrRemoved && (addedOrRemoved xor (direction == TransitionDirection.ENTER))) gravity.reverse() else gravity
+    val actualGravity =
+        if (reverseWhenAddedOrRemoved && (addedOrRemoved xor (direction == TransitionDirection.ENTER))) gravity.reverse() else gravity
     val endValues = slideEndValues(animationContainer, actualGravity).let {
         when (direction) {
             TransitionDirection.EXIT -> it
@@ -35,7 +36,14 @@ fun <T> TransitionElement<out T>.slide(
         ReverseHolder()
 
     return Transition.from(
-        slideValueAnimator(actualGravity, endValues, interpolator, duration, evaluator, reverseHolder),
+        slideValueAnimator(
+            actualGravity,
+            endValues,
+            interpolator,
+            duration,
+            evaluator,
+            reverseHolder
+        ),
         reverseHolder
     )
 }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideCalculations.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideCalculations.kt
index a2e056008..d42b6f288 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideCalculations.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideCalculations.kt
@@ -10,7 +10,6 @@ import com.badoo.ribs.routing.transition.effect.helper.AnimationContainer.RootVi
 import com.badoo.ribs.routing.transition.effect.helper.EndValues
 import com.badoo.ribs.routing.transition.effect.helper.findParentById
 
-
 internal fun <T> TransitionElement<out T>.slideEndValues(
     animationContainer: AnimationContainer,
     gravity: Gravity
@@ -23,7 +22,8 @@ internal fun <T> TransitionElement<out T>.slideEndValues(
 
     requireNotNull(container)
 
-    val diffToAnimationContainer: Int = diffToAnimationContainer(animationContainer, gravity, container)
+    val diffToAnimationContainer: Int =
+        diffToAnimationContainer(animationContainer, gravity, container)
 
     return when (gravity) {
         Gravity.LEFT -> EndValues(0f, -(view.width + diffToAnimationContainer).toFloat())
@@ -40,7 +40,9 @@ private fun <T> TransitionElement<out T>.diffToAnimationContainer(
 ): Int {
     val location = IntArray(2)
     when (animationContainer) {
-        is RootView -> { /* no-op, location stays [0,0] */ }
+        is RootView -> { /* no-op, location stays [0,0] */
+        }
+
         is Parent,
         is FindParentById -> container.getLocationInWindow(location)
     }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideValueAnimator.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideValueAnimator.kt
index ffc8ebfeb..e254a7fe4 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideValueAnimator.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/effect/slide/SlideValueAnimator.kt
@@ -1,4 +1,5 @@
 @file:SuppressWarnings("LongParameterList")
+
 package com.badoo.ribs.routing.transition.effect.slide
 
 import android.animation.Animator
@@ -13,7 +14,6 @@ import com.badoo.ribs.routing.transition.effect.helper.ReverseHolder
 import com.badoo.ribs.routing.transition.progress.SingleProgressEvaluator
 import kotlin.math.abs
 
-
 internal fun <T> TransitionElement<out T>.slideValueAnimator(
     gravity: Gravity,
     endValues: EndValues,
@@ -36,7 +36,7 @@ internal fun <T> TransitionElement<out T>.slideValueAnimator(
     return valueAnimator
 }
 
-private  fun <T> TransitionElement<out T>.slideUpdateListener(
+private fun <T> TransitionElement<out T>.slideUpdateListener(
     gravity: Gravity,
     endValues: EndValues,
     evaluator: SingleProgressEvaluator
@@ -53,7 +53,7 @@ private  fun <T> TransitionElement<out T>.slideUpdateListener(
     }
 }
 
-private  fun slideStartEndNotifier(
+private fun slideStartEndNotifier(
     evaluator: SingleProgressEvaluator,
     reverseHolder: ReverseHolder
 ): AnimatorListenerAdapter = object : AnimatorListenerAdapter() {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/CrossFader.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/CrossFader.kt
index b2a6a9b4c..3c918a27c 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/CrossFader.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/CrossFader.kt
@@ -8,7 +8,6 @@ import com.badoo.ribs.routing.transition.TransitionPair
 import com.badoo.ribs.routing.transition.effect.fade.fade
 import com.badoo.ribs.routing.transition.invoke
 
-
 open class CrossFader<T>(
     private val duration: Long = defaultDuration,
     private val interpolator: Interpolator = defaultInterpolator,
@@ -17,11 +16,11 @@ open class CrossFader<T>(
 
     override fun onTransition(elements: List<TransitionElement<out T>>): TransitionPair {
         val exiting = elements
-            .filter { it.direction == TransitionDirection.EXIT && condition(it)}
+            .filter { it.direction == TransitionDirection.EXIT && condition(it) }
             .invoke { fade(duration, interpolator) }
 
         val entering = elements
-            .filter { it.direction == TransitionDirection.ENTER && condition(it)}
+            .filter { it.direction == TransitionDirection.ENTER && condition(it) }
             .invoke { fade(duration, interpolator) }
 
         return TransitionPair(
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/SharedElements.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/SharedElements.kt
index 496a6e016..a1c70d56e 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/SharedElements.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/SharedElements.kt
@@ -5,7 +5,6 @@ import com.badoo.ribs.routing.transition.TransitionPair
 import com.badoo.ribs.routing.transition.effect.sharedelement.SharedElementTransition.Params
 import com.badoo.ribs.routing.transition.effect.sharedelement.sharedElementTransition
 
-
 open class SharedElements<T>(
     private val params: List<Params>,
     private val condition: (TransitionElement<out T>) -> Boolean = { true }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/Slider.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/Slider.kt
index 5f3b28c84..1d8060ad0 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/Slider.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/Slider.kt
@@ -11,7 +11,6 @@ import com.badoo.ribs.routing.transition.effect.helper.AnimationContainer
 import com.badoo.ribs.routing.transition.effect.slide.slide
 import com.badoo.ribs.routing.transition.invoke
 
-
 open class Slider<T>(
     private val gravity: Gravity = Gravity.LEFT,
     private val animationContainer: AnimationContainer = AnimationContainer.RootView,
@@ -22,7 +21,7 @@ open class Slider<T>(
 
     override fun onTransition(elements: List<TransitionElement<out T>>): TransitionPair {
         val exit = elements.filter { it.direction == EXIT && condition(it) }
-        val enter = elements.filter { it.direction == ENTER && condition(it)}
+        val enter = elements.filter { it.direction == ENTER && condition(it) }
 
         return TransitionPair(
             exiting = Transition.multiple(
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TabSwitcher.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TabSwitcher.kt
index eeb12e83c..f4e6dd5ca 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TabSwitcher.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TabSwitcher.kt
@@ -11,7 +11,6 @@ import com.badoo.ribs.routing.transition.effect.helper.AnimationContainer
 import com.badoo.ribs.routing.transition.effect.slide.slide
 import com.badoo.ribs.routing.transition.invoke
 
-
 open class TabSwitcher<T>(
     private val tabsOrder: List<T>,
     private val animationContainer: AnimationContainer = AnimationContainer.Parent,
@@ -34,7 +33,15 @@ open class TabSwitcher<T>(
                 exit { slide(gravity, animationContainer, duration, interpolator, false) }
             ),
             entering = Transition.multiple(
-                enter { slide(gravity.reverse(), animationContainer, duration, interpolator, false) }
+                enter {
+                    slide(
+                        gravity.reverse(),
+                        animationContainer,
+                        duration,
+                        interpolator,
+                        false
+                    )
+                }
             )
 
         )
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TransitionHandler.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TransitionHandler.kt
index 13b84eaee..b8d10caa6 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TransitionHandler.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/handler/TransitionHandler.kt
@@ -4,7 +4,6 @@ import com.badoo.ribs.routing.transition.Transition
 import com.badoo.ribs.routing.transition.TransitionElement
 import com.badoo.ribs.routing.transition.TransitionPair
 
-
 /**
  * Interface to be implemented in client code to handle transition animations of
  * routing changes.
@@ -41,8 +40,8 @@ interface TransitionHandler<C> {
             val pairs = handlers.map { it.onTransition(elements) }
 
             return TransitionPair(
-                exiting = Transition.multiple ( pairs.map { it.exiting } ),
-                entering = Transition.multiple ( pairs.map { it.entering } )
+                exiting = Transition.multiple(pairs.map { it.exiting }),
+                entering = Transition.multiple(pairs.map { it.entering })
             )
         }
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/progress/SingleProgressEvaluator.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/progress/SingleProgressEvaluator.kt
index 7036c1d52..6b7c93303 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/progress/SingleProgressEvaluator.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/routing/transition/progress/SingleProgressEvaluator.kt
@@ -9,12 +9,13 @@ import com.badoo.ribs.util.RIBs
 class SingleProgressEvaluator : ProgressEvaluator {
 
     private sealed class Progress {
-        object Initialised : Progress()
-        object Reset : Progress()
+        data object Initialised : Progress()
+        data object Reset : Progress()
         class InProgress : Progress() {
             var progress: Float = 0f
         }
-        object Finished : Progress()
+
+        data object Finished : Progress()
     }
 
     private val state = object : Store<Progress>(Progress.Initialised) {
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStore.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStore.kt
index f0e8acaf8..f4307a51d 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStore.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStore.kt
@@ -21,7 +21,12 @@ import kotlin.reflect.KClass
  */
 interface RetainedInstanceStore {
 
-    fun <T : Any> get(owner: Rib.Identifier, clazz: KClass<*>, disposer: (T) -> Unit, factory: () -> T): T
+    fun <T : Any> get(
+        owner: Rib.Identifier,
+        clazz: KClass<*>,
+        disposer: (T) -> Unit,
+        factory: () -> T
+    ): T
 
     fun isRetainedByOwner(owner: Rib.Identifier, value: Any): Boolean
 
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStoreImpl.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStoreImpl.kt
index 463b2d143..fc79e7d97 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStoreImpl.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/store/RetainedInstanceStoreImpl.kt
@@ -8,7 +8,12 @@ internal class RetainedInstanceStoreImpl : RetainedInstanceStore {
     private val map: MutableMap<Rib.Identifier, MutableMap<KClass<*>, ValueHolder<*>>> = HashMap()
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : Any> get(owner: Rib.Identifier, clazz: KClass<*>, disposer: (T) -> Unit, factory: () -> T): T =
+    override fun <T : Any> get(
+        owner: Rib.Identifier,
+        clazz: KClass<*>,
+        disposer: (T) -> Unit,
+        factory: () -> T
+    ): T =
         map
             .getOrPut(owner) { HashMap() }
             .getOrPut(clazz) { ValueHolder(factory(), disposer) }
diff --git a/libraries/rib-base/src/main/java/com/badoo/ribs/util/RIBs.kt b/libraries/rib-base/src/main/java/com/badoo/ribs/util/RIBs.kt
index abaf6138f..51e0b6cfd 100644
--- a/libraries/rib-base/src/main/java/com/badoo/ribs/util/RIBs.kt
+++ b/libraries/rib-base/src/main/java/com/badoo/ribs/util/RIBs.kt
@@ -104,11 +104,13 @@ object RIBs {
             internalGroup: Int,
             event: RequestCodeBasedEventStream.RequestCodeBasedEvent
         ) {
-            Log.e(TAG, "There's no one listening for request code event! " +
-                "requestCode: $requestCode, " +
-                "resolved group: $internalGroup, " +
-                "resolved code: $internalRequestCode, " +
-                "event: $event")
+            Log.e(
+                TAG, "There's no one listening for request code event! " +
+                        "requestCode: $requestCode, " +
+                        "resolved group: $internalGroup, " +
+                        "resolved code: $internalRequestCode, " +
+                        "event: $event"
+            )
         }
 
         @Suppress("TooGenericExceptionThrown")
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImplTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImplTest.kt
index c6400facf..5a3ef8be9 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImplTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeBasedEventStreamImplTest.kt
@@ -2,14 +2,14 @@ package com.badoo.ribs.android.requestcode
 
 import com.badoo.ribs.minimal.reactive.CompositeCancellable
 import com.badoo.ribs.util.RIBs
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
 
 class RequestCodeBasedEventStreamImplTest {
 
@@ -35,7 +35,12 @@ class RequestCodeBasedEventStreamImplTest {
 
         stream.testPublish(1, event)
 
-        verify(RIBs.errorHandler).handleNoRequestCodeListenersError(eq(1), eq(internalRequestCode), any(), eq(event))
+        verify(RIBs.errorHandler).handleNoRequestCodeListenersError(
+            eq(1),
+            eq(internalRequestCode),
+            any(),
+            eq(event)
+        )
     }
 
     @Test
@@ -48,14 +53,21 @@ class RequestCodeBasedEventStreamImplTest {
 
         stream.testPublish(externalRequestCode, event)
 
-        verify(RIBs.errorHandler, never()).handleNoRequestCodeListenersError(any(), any(), any(), any())
+        verify(RIBs.errorHandler, never()).handleNoRequestCodeListenersError(
+            any(),
+            any(),
+            any(),
+            any()
+        )
     }
 
     class TestRequestCodeClient(override val requestCodeClientId: String) : RequestCodeClient
 
-    class TestEvent(override val requestCode: Int) : RequestCodeBasedEventStream.RequestCodeBasedEvent
+    class TestEvent(override val requestCode: Int) :
+        RequestCodeBasedEventStream.RequestCodeBasedEvent
 
-    class TestRequestCodeBasedEventStream : RequestCodeBasedEventStreamImpl<TestEvent>(requestCodeRegistry = RequestCodeRegistry(null)) {
+    class TestRequestCodeBasedEventStream :
+        RequestCodeBasedEventStreamImpl<TestEvent>(requestCodeRegistry = RequestCodeRegistry(null)) {
 
         fun testPublish(externalRequestCode: Int, event: TestEvent) {
             publish(externalRequestCode, event)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeRegistryTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeRegistryTest.kt
index 11f3b6a76..64e7cb771 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeRegistryTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/android/requestcode/RequestCodeRegistryTest.kt
@@ -1,21 +1,22 @@
 package com.badoo.ribs.android.requestcode
 
 import android.os.Bundle
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Before
-import org.junit.Test
+import kotlin.math.pow
 
 class RequestCodeRegistryTest {
 
     companion object {
         private const val NB_LOWER_BITS = 4
-        private val MAX_REQUEST_CODE = Math.pow(2.0, NB_LOWER_BITS.toDouble()).toInt() - 1
+        private val MAX_REQUEST_CODE = 2.0.pow(NB_LOWER_BITS.toDouble()).toInt() - 1
     }
 
     private lateinit var requestCodeRegistry: RequestCodeRegistry
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/ConnectableNodeTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/ConnectableNodeTest.kt
index 1578f0351..e9fb770c3 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/ConnectableNodeTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/ConnectableNodeTest.kt
@@ -2,18 +2,17 @@ package com.badoo.ribs.clienthelper.connector
 
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.helper.TestNode
-import com.badoo.ribs.core.plugin.SubtreeChangeAware
-import com.badoo.ribs.test.BaseConnectableNodeTest
 import com.badoo.ribs.core.helper.connectable.ConnectableTestNode
 import com.badoo.ribs.core.helper.connectable.ConnectableTestRib
 import com.badoo.ribs.core.helper.connectable.ConnectableTestRib.Output.Output1
 import com.badoo.ribs.core.helper.connectable.ConnectableTestRib.Output.Output2
-import io.reactivex.observers.TestObserver
+import com.badoo.ribs.core.plugin.SubtreeChangeAware
+import com.badoo.ribs.test.BaseConnectableNodeTest
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
-
 class ConnectableNodeTest : BaseConnectableNodeTest() {
 
     private lateinit var parent: TestNode
@@ -65,7 +64,7 @@ class ConnectableNodeTest : BaseConnectableNodeTest() {
         children.output.accept(Output2)
         parent.attachChildNode(children)
 
-        testObserver.assertValues(Output1,Output2)
+        testObserver.assertValues(Output1, Output2)
     }
 
     @Test
@@ -76,6 +75,6 @@ class ConnectableNodeTest : BaseConnectableNodeTest() {
         parent.attachChildNode(children)
         children.output.accept(Output2)
 
-        testObserver.assertValues(Output1,Output2)
+        testObserver.assertValues(Output1, Output2)
     }
 }
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/NodeConnectorTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/NodeConnectorTest.kt
index bba9aefe5..c7961f6b3 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/NodeConnectorTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/clienthelper/connector/NodeConnectorTest.kt
@@ -6,7 +6,7 @@ import com.badoo.ribs.core.helper.connectable.ConnectableTestRib.Output.Output1
 import com.badoo.ribs.core.helper.connectable.ConnectableTestRib.Output.Output2
 import com.badoo.ribs.core.helper.connectable.ConnectableTestRib.Output.Output3
 import com.badoo.ribs.test.BaseNodeConnectorTest
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.RepeatedTest
@@ -16,7 +16,6 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-
 class NodeConnectorTest : BaseNodeConnectorTest() {
 
     private val firstTestObserver = TestObserver<Output>()
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeBackPressHandlingTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeBackPressHandlingTest.kt
index af64530db..91f0db9c9 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeBackPressHandlingTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeBackPressHandlingTest.kt
@@ -4,19 +4,19 @@ import com.badoo.ribs.core.helper.TestNode
 import com.badoo.ribs.core.helper.TestView
 import com.badoo.ribs.core.plugin.BackPressHandler
 import com.badoo.ribs.core.plugin.SubtreeBackPressHandler
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.never
-import org.mockito.kotlin.verify
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class NodeBackPressHandlingTest : NodePluginTest() {
-    
+
     private lateinit var subtreeHandlers: List<SubtreeBackPressHandler>
     private lateinit var simpleHandlers: List<BackPressHandler>
     private lateinit var inactiveChild: TestNode
@@ -29,13 +29,17 @@ class NodeBackPressHandlingTest : NodePluginTest() {
         subtreeHandlerReturnsTrueOnFallback: Int? = null,
         simpleHandlerReturnsTrue: Int? = null
     ): Node<TestView> {
-        subtreeHandlers = List<SubtreeBackPressHandler>(3) { i -> mock {
-            on { handleBackPressFirst() } doReturn (subtreeHandlerReturnsTrueOnFirst == i)
-            on { handleBackPressFallback() } doReturn (subtreeHandlerReturnsTrueOnFallback == i)
-        }}
-        simpleHandlers = List<BackPressHandler>(3) { i -> mock {
-            on { handleBackPress() } doReturn (simpleHandlerReturnsTrue == i)
-        }}
+        subtreeHandlers = List(3) { i ->
+            mock {
+                on { handleBackPressFirst() } doReturn (subtreeHandlerReturnsTrueOnFirst == i)
+                on { handleBackPressFallback() } doReturn (subtreeHandlerReturnsTrueOnFallback == i)
+            }
+        }
+        simpleHandlers = List(3) { i ->
+            mock {
+                on { handleBackPress() } doReturn (simpleHandlerReturnsTrue == i)
+            }
+        }
 
         val node = createNode(plugins = subtreeHandlers + simpleHandlers)
         inactiveChild = createChildNode(node)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginAndroidLifecycleAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginAndroidLifecycleAwareTest.kt
index fc55800e1..390f347e3 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginAndroidLifecycleAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginAndroidLifecycleAwareTest.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.core
 
 import com.badoo.ribs.core.plugin.AndroidLifecycleAware
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeAwareTest.kt
index a0840735d..960b43a17 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeAwareTest.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.core
 
 import com.badoo.ribs.core.plugin.NodeAware
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeLifecycleAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeLifecycleAwareTest.kt
index 144e1feab..8128114cf 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeLifecycleAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginNodeLifecycleAwareTest.kt
@@ -3,11 +3,11 @@ package com.badoo.ribs.core
 import com.badoo.ribs.core.helper.TestBuilder
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.core.plugin.NodeLifecycleAware
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
-import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginRibAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginRibAwareTest.kt
index dd79e9fcb..7da18d5d0 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginRibAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginRibAwareTest.kt
@@ -1,14 +1,14 @@
 package com.badoo.ribs.core
 
-import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.core.helper.TestBuilder
 import com.badoo.ribs.core.helper.TestRib
+import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.core.plugin.RibAware
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
-import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSavesInstanceStateTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSavesInstanceStateTest.kt
index 49cfe46f3..221a7b576 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSavesInstanceStateTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSavesInstanceStateTest.kt
@@ -2,10 +2,10 @@ package com.badoo.ribs.core
 
 import android.os.Bundle
 import com.badoo.ribs.core.plugin.SavesInstanceState
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeChangeAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeChangeAwareTest.kt
index 985b67d80..bd7a14a00 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeChangeAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeChangeAwareTest.kt
@@ -4,11 +4,11 @@ import com.badoo.ribs.core.helper.TestBuilder
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.core.plugin.SubtreeChangeAware
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
-import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeViewChangeAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeViewChangeAwareTest.kt
index 6c88e6d61..7f8f98b73 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeViewChangeAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSubtreeViewChangeAwareTest.kt
@@ -1,10 +1,10 @@
 package com.badoo.ribs.core
 
 import com.badoo.ribs.core.plugin.SubtreeViewChangeAware
-import org.mockito.kotlin.eq
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSystemAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSystemAwareTest.kt
index 26cc81976..6f606761b 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSystemAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginSystemAwareTest.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.core
 
 import com.badoo.ribs.core.plugin.SystemAware
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginTest.kt
index 2300178c9..18e5a97d5 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginTest.kt
@@ -11,10 +11,10 @@ import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.routing.Routing
+import org.junit.Before
 import org.mockito.kotlin.argThat
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
-import org.junit.Before
 
 open class NodePluginTest {
     protected lateinit var view: TestView
@@ -34,7 +34,7 @@ open class NodePluginTest {
     }
 
     protected inline fun <reified T : Plugin> testPlugins(nbPlugins: Int = 3): Pair<Node<TestView>, List<T>> =
-        testPlugins(List<T>(nbPlugins) { mock<T>() })
+        testPlugins(List(nbPlugins) { mock<T>() })
 
     protected inline fun <reified T : Plugin> testPlugins(plugins: List<T>): Pair<Node<TestView>, List<T>> {
         val node = createNode(
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewAwareTest.kt
index 746208b00..22474aeff 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewAwareTest.kt
@@ -2,11 +2,11 @@ package com.badoo.ribs.core
 
 import com.badoo.ribs.core.helper.TestView
 import com.badoo.ribs.core.plugin.ViewAware
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.kotlin.any
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.verify
-import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewLifecycleAwareTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewLifecycleAwareTest.kt
index e9caaa5f2..0d3805924 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewLifecycleAwareTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodePluginViewLifecycleAwareTest.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.core
 
 import com.badoo.ribs.core.plugin.ViewLifecycleAware
-import org.mockito.kotlin.verify
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeTest.kt
index 00c2f807b..681a12c2c 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/NodeTest.kt
@@ -23,8 +23,8 @@ import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.store.RetainedInstanceStore
 import com.badoo.ribs.util.RIBs
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.functions.Consumer
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -334,7 +334,10 @@ class NodeTest {
         directChild.attachChildNode(grandChild)
         node.attachChildNode(directChild)
 
-        assertEquals(Lifecycle.State.CREATED, grandChild.lifecycleManager.externalLifecycle.currentState)
+        assertEquals(
+            Lifecycle.State.CREATED,
+            grandChild.lifecycleManager.externalLifecycle.currentState
+        )
     }
 
     @Test
@@ -365,7 +368,10 @@ class NodeTest {
         directChild.attachChildNode(grandChild)
         node.attachChildNode(directChild)
 
-        assertEquals(Lifecycle.State.STARTED, grandChild.lifecycleManager.externalLifecycle.currentState)
+        assertEquals(
+            Lifecycle.State.STARTED,
+            grandChild.lifecycleManager.externalLifecycle.currentState
+        )
     }
 
     @Test
@@ -399,7 +405,10 @@ class NodeTest {
         directChild.attachChildNode(grandChild)
         node.attachChildNode(directChild)
 
-        assertEquals(Lifecycle.State.RESUMED, grandChild.lifecycleManager.externalLifecycle.currentState)
+        assertEquals(
+            Lifecycle.State.RESUMED,
+            grandChild.lifecycleManager.externalLifecycle.currentState
+        )
     }
 
     @Ignore("This should be reworked to match new mechanism")
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
index 7081f471d..1b16d0a3a 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
@@ -2,17 +2,17 @@ package com.badoo.ribs.core
 
 import com.badoo.ribs.core.helper.TestRouter
 import com.badoo.ribs.core.helper.TestView
-import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.core.view.RibView
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
+import com.badoo.ribs.routing.resolution.Resolution
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Answers
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
@@ -35,9 +35,11 @@ class RouterTest {
         childNodeC2_1 = mock()
         childNodeC2_2 = mock()
 
-        resolutionForC2 = mock { on { buildNodes(any())} doReturn listOf(
-            childNodeC2_1.toRib(),
-            childNodeC2_2.toRib())
+        resolutionForC2 = mock {
+            on { buildNodes(any()) } doReturn listOf(
+                childNodeC2_1.toRib(),
+                childNodeC2_2.toRib()
+            )
         }
         resolutionForC1 = mock()
         resolutionForC3 = mock()
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/AnyConfiguration.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/AnyConfiguration.kt
index ea5188d6c..8174ed55e 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/AnyConfiguration.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/AnyConfiguration.kt
@@ -4,4 +4,6 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-object AnyConfiguration : Parcelable { override fun toString(): String = "AnyConfiguration" }
+object AnyConfiguration : Parcelable {
+    override fun toString(): String = "AnyConfiguration"
+}
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestBuildParams.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestBuildParams.kt
index a5c1cb1ff..6fb02c0f8 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestBuildParams.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestBuildParams.kt
@@ -7,7 +7,7 @@ import com.badoo.ribs.core.modality.ActivationMode
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.core.modality.BuildParams
-import java.util.*
+import java.util.UUID
 
 fun testBuildParams(
     savedInstanceState: Bundle? = null,
@@ -15,7 +15,7 @@ fun testBuildParams(
     identifier: Rib.Identifier = Rib.Identifier(
         uuid = UUID.randomUUID()
     )
-) = BuildParams<Nothing?>(
+) = BuildParams(
     payload = null,
     buildContext = if (ancestryInfo == null) {
         BuildContext.root(savedInstanceState)
@@ -25,6 +25,7 @@ fun testBuildParams(
             activationMode = ActivationMode.ATTACH_TO_PARENT,
             savedInstanceState = savedInstanceState,
             customisations = RibCustomisationDirectoryImpl()
-    )},
+        )
+    },
     identifier = identifier
 )
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRib.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRib.kt
index 1029bd052..5e5f24421 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRib.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRib.kt
@@ -2,5 +2,4 @@ package com.badoo.ribs.core.helper
 
 import com.badoo.ribs.core.Rib
 
-interface TestRib : Rib {
-}
+interface TestRib : Rib
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
index 6686581be..c18d3e80e 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.core.helper
 
 import android.os.Parcelable
-import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.core.modality.BuildParams
+import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.resolution.Resolution
+import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.routing.source.backstack.BackStack
-import com.badoo.ribs.routing.Routing
-import org.mockito.kotlin.mock
 import kotlinx.parcelize.Parcelize
+import org.mockito.kotlin.mock
 
 class TestRouter(
     buildParams: BuildParams<Nothing?> = testBuildParams(),
@@ -31,17 +31,51 @@ class TestRouter(
 
     sealed class Configuration : Parcelable {
         // Content
-        @Parcelize object C1 : Configuration() { override fun toString(): String = "C1" }
-        @Parcelize object C2 : Configuration() { override fun toString(): String = "C2" }
-        @Parcelize object C3 : Configuration() { override fun toString(): String = "C3" }
-        @Parcelize object C4 : Configuration() { override fun toString(): String = "C4" }
-        @Parcelize object C5 : Configuration() { override fun toString(): String = "C5" }
-        @Parcelize data class C6(val i: Int) : Configuration() { override fun toString(): String = "C6" }
+        @Parcelize
+        object C1 : Configuration() {
+            override fun toString(): String = "C1"
+        }
+
+        @Parcelize
+        object C2 : Configuration() {
+            override fun toString(): String = "C2"
+        }
+
+        @Parcelize
+        object C3 : Configuration() {
+            override fun toString(): String = "C3"
+        }
+
+        @Parcelize
+        object C4 : Configuration() {
+            override fun toString(): String = "C4"
+        }
+
+        @Parcelize
+        object C5 : Configuration() {
+            override fun toString(): String = "C5"
+        }
+
+        @Parcelize
+        data class C6(val i: Int) : Configuration() {
+            override fun toString(): String = "C6"
+        }
 
         // Overlay
-        @Parcelize object O1 : Configuration() { override fun toString(): String = "O1" }
-        @Parcelize object O2 : Configuration() { override fun toString(): String = "O2" }
-        @Parcelize object O3 : Configuration() { override fun toString(): String = "O3" }
+        @Parcelize
+        object O1 : Configuration() {
+            override fun toString(): String = "O1"
+        }
+
+        @Parcelize
+        object O2 : Configuration() {
+            override fun toString(): String = "O2"
+        }
+
+        @Parcelize
+        object O3 : Configuration() {
+            override fun toString(): String = "O3"
+        }
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/connectable/ConnectableTestRib.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/connectable/ConnectableTestRib.kt
index 54a434702..4d53e1cdc 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/connectable/ConnectableTestRib.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/connectable/ConnectableTestRib.kt
@@ -9,8 +9,8 @@ interface ConnectableTestRib : Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object Output1 : Output()
-        object Output2 : Output()
-        object Output3 : Output()
+        data object Output1 : Output()
+        data object Output2 : Output()
+        data object Output3 : Output()
     }
 }
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/CappedLifecycleTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/CappedLifecycleTest.kt
index a50ab7528..da38655ea 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/CappedLifecycleTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/CappedLifecycleTest.kt
@@ -7,11 +7,11 @@ import androidx.lifecycle.Lifecycle.State.INITIALIZED
 import androidx.lifecycle.Lifecycle.State.RESUMED
 import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.LifecycleRegistry
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.whenever
 import org.junit.Assert.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 class CappedLifecycleTest {
 
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/LifecycleManagerTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/LifecycleManagerTest.kt
index 46d63e614..1eb3429f3 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/LifecycleManagerTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/core/lifecycle/LifecycleManagerTest.kt
@@ -7,11 +7,11 @@ import com.badoo.ribs.core.helper.TestNode
 import com.badoo.ribs.core.helper.testBuildParams
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.routing.Routing
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
 import org.junit.Assert.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 import java.util.concurrent.CopyOnWriteArrayList
 
 class LifecycleManagerTest {
@@ -47,7 +47,8 @@ class LifecycleManagerTest {
     @Test
     fun `onAttachChild() lifecycle inheritance is recursive`() {
         val grandChildAncestryInfo = AncestryInfo.Child(child1, Routing(AnyConfiguration))
-        val grandChild: Node<*> = TestNode(buildParams = testBuildParams(ancestryInfo = grandChildAncestryInfo))
+        val grandChild: Node<*> =
+            TestNode(buildParams = testBuildParams(ancestryInfo = grandChildAncestryInfo))
         child1.attachChildNode(grandChild)
 
         val expected = RESUMED
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/reactive/CombineLatestTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/reactive/CombineLatestTest.kt
index 0190d12d6..d1290d7c1 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/reactive/CombineLatestTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/reactive/CombineLatestTest.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.minimal.reactive
 
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.Test
 
 class CombineLatestTest {
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/state/StoreTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/state/StoreTest.kt
index 282edddc4..7e82d2ff0 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/state/StoreTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/minimal/state/StoreTest.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.minimal.state
 
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/source/impl/PoolTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/source/impl/PoolTest.kt
index 83f606b35..5d6d27464 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/source/impl/PoolTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/source/impl/PoolTest.kt
@@ -131,7 +131,12 @@ class PoolTest {
         )
         pool.add(conf2Item)
 
-        assertEquals(listOf(conf1Item.toRoutingHistoryElement(), conf2Item.toRoutingHistoryElement()), routingHistoryElements)
+        assertEquals(
+            listOf(
+                conf1Item.toRoutingHistoryElement(),
+                conf2Item.toRoutingHistoryElement()
+            ), routingHistoryElements
+        )
     }
 
     private fun pool(
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackDiffingIntegrationTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackDiffingIntegrationTest.kt
index 1bbd036a9..78d7fb61f 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackDiffingIntegrationTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackDiffingIntegrationTest.kt
@@ -36,7 +36,7 @@ class BackStackDiffingIntegrationTest {
 
     @Before
     fun setUp() {
-        backStack = BackStack<C>(
+        backStack = BackStack(
             initialConfiguration = C1,
             buildParams = emptyBuildParams()
         )
@@ -51,7 +51,12 @@ class BackStackDiffingIntegrationTest {
     fun overlay(position: Int, content: C, overlayIndex: Int, overlay: C): Routing<C> =
         Routing(
             configuration = overlay,
-            identifier = backStack.state.overlayIdForPosition(position, content, overlayIndex, overlay)
+            identifier = backStack.state.overlayIdForPosition(
+                position,
+                content,
+                overlayIndex,
+                overlay
+            )
         )
 
     @Test
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackFeatureTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackFeatureTest.kt
index 219fc5f2a..a642b7e58 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackFeatureTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/BackStackFeatureTest.kt
@@ -7,17 +7,17 @@ import com.badoo.ribs.core.helper.TestRouter.Configuration.C3
 import com.badoo.ribs.minimal.state.TimeCapsule
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
-import com.badoo.ribs.routing.source.backstack.Elements
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.BackStack.State
+import com.badoo.ribs.routing.source.backstack.Elements
 import com.badoo.ribs.routing.state.feature.operation.asBackStackElements
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
 
 // TODO add more tests:
 //  - identifier maintenance
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingContextTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingContextTest.kt
index 494c72236..5e6d0c9e9 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingContextTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingContextTest.kt
@@ -10,12 +10,18 @@ import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.resolver.RoutingResolver
-import com.badoo.ribs.routing.state.RoutingContext.ActivationState.*
+import com.badoo.ribs.routing.state.RoutingContext.ActivationState.ACTIVE
+import com.badoo.ribs.routing.state.RoutingContext.ActivationState.INACTIVE
+import com.badoo.ribs.routing.state.RoutingContext.ActivationState.SLEEPING
 import com.badoo.ribs.routing.state.RoutingContext.Resolved
 import com.badoo.ribs.routing.state.RoutingContext.Unresolved
-import org.mockito.kotlin.*
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class RoutingContextTest {
 
@@ -127,7 +133,7 @@ class RoutingContextTest {
             parentNode,
             parentNode,
             NB_EXPECTED_NODES,
-            emptyList<Bundle>()
+            emptyList()
         )
     }
 
@@ -140,7 +146,7 @@ class RoutingContextTest {
             mockAnchor,
             parentNode,
             NB_EXPECTED_NODES,
-            emptyList<Bundle>()
+            emptyList()
         )
     }
 
@@ -263,7 +269,7 @@ class RoutingContextTest {
     @Test
     fun `Resolved shrink() keeps configuration`() {
         val routing = Routing(mock<Parcelable>())
-        val resolved = Resolved<Parcelable>(ACTIVE, routing, mock(), mock(), mock())
+        val resolved = Resolved(ACTIVE, routing, mock(), mock(), mock())
         val unresolved = resolved.shrink()
         assertEquals(routing, unresolved.routing)
     }
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingStatePoolTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingStatePoolTest.kt
index 9bd3b72af..6b8f0fce7 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingStatePoolTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/RoutingStatePoolTest.kt
@@ -23,7 +23,7 @@ import com.badoo.ribs.routing.state.feature.Transaction
 import com.badoo.ribs.routing.state.feature.Transaction.PoolCommand.Sleep
 import com.badoo.ribs.routing.state.feature.Transaction.PoolCommand.WakeUp
 import com.badoo.ribs.routing.state.feature.state.SavedState
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.mockito.kotlin.*
 import kotlinx.parcelize.Parcelize
 import org.junit.Assert.assertEquals
@@ -34,16 +34,24 @@ import org.mockito.ArgumentMatchers.anyList
 
 // FIXME rework test suite -- many of the responsibilities has been moved out to other classes
 //  TODO test only remaining responsibilities without assumptions on view detach / attach etc.
+@SuppressWarnings("LargeClass")
 class RoutingStatePoolTest {
 
     sealed class Configuration : Parcelable {
-        @Parcelize object Permanent1 : Configuration()
-        @Parcelize object Permanent2 : Configuration()
-        @Parcelize object ContentViewParented1 : Configuration()
-        @Parcelize object ContentViewParented2 : Configuration()
-        @Parcelize object ContentViewParented3 : Configuration()
-        @Parcelize object ContentExternal1 : Configuration()
-        @Parcelize object ContentExternal2 : Configuration()
+        @Parcelize
+        data object Permanent1 : Configuration()
+        @Parcelize
+        data object Permanent2 : Configuration()
+        @Parcelize
+        data object ContentViewParented1 : Configuration()
+        @Parcelize
+        data object ContentViewParented2 : Configuration()
+        @Parcelize
+        data object ContentViewParented3 : Configuration()
+        @Parcelize
+        data object ContentExternal1 : Configuration()
+        @Parcelize
+        data object ContentExternal2 : Configuration()
     }
 
     private lateinit var emptyTimeCapsule: TimeCapsule
@@ -70,7 +78,11 @@ class RoutingStatePoolTest {
         val resolution: Resolution
     ) {
         companion object {
-            fun create(routing: Routing<Configuration>, nbNodes: Int, viewActivationMode: ActivationMode): ConfigurationTestHelper {
+            fun create(
+                routing: Routing<Configuration>,
+                nbNodes: Int,
+                viewActivationMode: ActivationMode
+            ): ConfigurationTestHelper {
                 val nodes = MutableList(nbNodes) { i ->
                     mock<Node<Nothing>> {
                         on { this.buildContext } doReturn BuildContext.root(null)
@@ -104,8 +116,8 @@ class RoutingStatePoolTest {
                 mock {
                     on { numberOfNodes } doReturn nbNodes
                     on { buildNodes(anyList()) } doAnswer {
-                        this@toRoutingAction.map {
-                            factory -> factory.invoke()
+                        this@toRoutingAction.map { factory ->
+                            factory.invoke()
                         }
                     }
                 }
@@ -115,34 +127,67 @@ class RoutingStatePoolTest {
     @Before
     @SuppressWarnings("LongMethod")
     fun setUp() {
-        val routingPermanent1 = Routing(identifier = Identifier("Permanent 0"), configuration = Permanent1 as Configuration)
-        val routingPermanent2 = Routing(identifier = Identifier("Permanent 1"), configuration = Permanent2 as Configuration)
-        val routingContentViewParented1 = Routing(identifier = Identifier("Content 0"), configuration = ContentViewParented1 as Configuration)
-        val routingContentViewParented2 = Routing(identifier = Identifier("Content 1"), configuration = ContentViewParented2 as Configuration)
-        val routingContentViewParented3 = Routing(identifier = Identifier("Content 2"), configuration = ContentViewParented3 as Configuration)
-        val routingContentExternal1 = Routing(identifier = Identifier("Content 3"), configuration = ContentExternal1 as Configuration)
-        val routingContentExternal2 = Routing(identifier = Identifier("Content 4"), configuration = ContentExternal2 as Configuration)
+        val routingPermanent1 = Routing(
+            identifier = Identifier("Permanent 0"),
+            configuration = Permanent1 as Configuration
+        )
+        val routingPermanent2 = Routing(
+            identifier = Identifier("Permanent 1"),
+            configuration = Permanent2 as Configuration
+        )
+        val routingContentViewParented1 = Routing(
+            identifier = Identifier("Content 0"),
+            configuration = ContentViewParented1 as Configuration
+        )
+        val routingContentViewParented2 = Routing(
+            identifier = Identifier("Content 1"),
+            configuration = ContentViewParented2 as Configuration
+        )
+        val routingContentViewParented3 = Routing(
+            identifier = Identifier("Content 2"),
+            configuration = ContentViewParented3 as Configuration
+        )
+        val routingContentExternal1 = Routing(
+            identifier = Identifier("Content 3"),
+            configuration = ContentExternal1 as Configuration
+        )
+        val routingContentExternal2 = Routing(
+            identifier = Identifier("Content 4"),
+            configuration = ContentExternal2 as Configuration
+        )
 
         helperPermanent1 =
-            ConfigurationTestHelper.create(routingPermanent1,2, ActivationMode.ATTACH_TO_PARENT)
+            ConfigurationTestHelper.create(routingPermanent1, 2, ActivationMode.ATTACH_TO_PARENT)
 
         helperPermanent2 =
-            ConfigurationTestHelper.create(routingPermanent2,3, ActivationMode.ATTACH_TO_PARENT)
+            ConfigurationTestHelper.create(routingPermanent2, 3, ActivationMode.ATTACH_TO_PARENT)
 
         helperContentViewParented1 =
-            ConfigurationTestHelper.create(routingContentViewParented1,2, ActivationMode.ATTACH_TO_PARENT)
+            ConfigurationTestHelper.create(
+                routingContentViewParented1,
+                2,
+                ActivationMode.ATTACH_TO_PARENT
+            )
 
         helperContentViewParented2 =
-            ConfigurationTestHelper.create(routingContentViewParented2,3, ActivationMode.ATTACH_TO_PARENT)
+            ConfigurationTestHelper.create(
+                routingContentViewParented2,
+                3,
+                ActivationMode.ATTACH_TO_PARENT
+            )
 
         helperContentViewParented3 =
-            ConfigurationTestHelper.create(routingContentViewParented3,2, ActivationMode.ATTACH_TO_PARENT)
+            ConfigurationTestHelper.create(
+                routingContentViewParented3,
+                2,
+                ActivationMode.ATTACH_TO_PARENT
+            )
 
         helperContentExternal1 =
-            ConfigurationTestHelper.create(routingContentExternal1,2, ActivationMode.CLIENT)
+            ConfigurationTestHelper.create(routingContentExternal1, 2, ActivationMode.CLIENT)
 
         helperContentExternal2 =
-            ConfigurationTestHelper.create(routingContentExternal2,3, ActivationMode.CLIENT)
+            ConfigurationTestHelper.create(routingContentExternal2, 3, ActivationMode.CLIENT)
 
         val helpers = listOf(
             helperPermanent1,
@@ -172,15 +217,43 @@ class RoutingStatePoolTest {
         )
 
         val poolInTimeCapsule = hashMapOf(
-            routingsforTimeCapsule[0] to Unresolved(SLEEPING, routingsforTimeCapsule[0], helperPermanent1.bundles),
-            routingsforTimeCapsule[1] to Unresolved(SLEEPING, routingsforTimeCapsule[1], helperPermanent2.bundles),
-
-            routingsforTimeCapsule[2] to Unresolved(SLEEPING, routingsforTimeCapsule[2], helperContentViewParented1.bundles),
-            routingsforTimeCapsule[3] to Unresolved(SLEEPING, routingsforTimeCapsule[3], helperContentViewParented2.bundles),
-            routingsforTimeCapsule[4] to Unresolved(INACTIVE, routingsforTimeCapsule[4], helperContentViewParented3.bundles),
-
-            routingsforTimeCapsule[5] to Unresolved(SLEEPING, routingsforTimeCapsule[5], helperContentExternal1.bundles),
-            routingsforTimeCapsule[6] to Unresolved(INACTIVE, routingsforTimeCapsule[6], helperContentExternal2.bundles)
+            routingsforTimeCapsule[0] to Unresolved(
+                SLEEPING,
+                routingsforTimeCapsule[0],
+                helperPermanent1.bundles
+            ),
+            routingsforTimeCapsule[1] to Unresolved(
+                SLEEPING,
+                routingsforTimeCapsule[1],
+                helperPermanent2.bundles
+            ),
+
+            routingsforTimeCapsule[2] to Unresolved(
+                SLEEPING,
+                routingsforTimeCapsule[2],
+                helperContentViewParented1.bundles
+            ),
+            routingsforTimeCapsule[3] to Unresolved(
+                SLEEPING,
+                routingsforTimeCapsule[3],
+                helperContentViewParented2.bundles
+            ),
+            routingsforTimeCapsule[4] to Unresolved(
+                INACTIVE,
+                routingsforTimeCapsule[4],
+                helperContentViewParented3.bundles
+            ),
+
+            routingsforTimeCapsule[5] to Unresolved(
+                SLEEPING,
+                routingsforTimeCapsule[5],
+                helperContentExternal1.bundles
+            ),
+            routingsforTimeCapsule[6] to Unresolved(
+                INACTIVE,
+                routingsforTimeCapsule[6],
+                helperContentExternal2.bundles
+            )
         )
 
         emptyTimeCapsule = mock()
@@ -224,12 +297,14 @@ class RoutingStatePoolTest {
     // For backwards compatibility with legacy testing approaches until test suite is reworked -- still
     //  better than throwing them away
     private fun RoutingStatePool<Configuration>.addPermanents() {
-        accept(Transaction.from(
-            Add(helperPermanent1.routing),
-            Add(helperPermanent2.routing),
-            Activate(helperPermanent1.routing),
-            Activate(helperPermanent2.routing)
-        ))
+        accept(
+            Transaction.from(
+                Add(helperPermanent1.routing),
+                Add(helperPermanent2.routing),
+                Activate(helperPermanent1.routing),
+                Activate(helperPermanent2.routing)
+            )
+        )
     }
 
     // region Init
@@ -313,8 +388,14 @@ class RoutingStatePoolTest {
 
         verify(routingActivator).add(helperPermanent1.routing, helperPermanent1.nodes)
         verify(routingActivator).add(helperPermanent2.routing, helperPermanent2.nodes)
-        verify(routingActivator).add(helperContentViewParented1.routing, helperContentViewParented1.nodes)
-        verify(routingActivator).add(helperContentViewParented2.routing, helperContentViewParented2.nodes)
+        verify(routingActivator).add(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
+        verify(routingActivator).add(
+            helperContentViewParented2.routing,
+            helperContentViewParented2.nodes
+        )
         verify(routingActivator).add(helperContentExternal1.routing, helperContentExternal1.nodes)
     }
 
@@ -335,13 +416,28 @@ class RoutingStatePoolTest {
         pool.accept(WakeUp())
         verify(routingActivator).activate(helperPermanent1.routing, helperPermanent1.nodes)
         verify(routingActivator).activate(helperPermanent2.routing, helperPermanent2.nodes)
-        verify(routingActivator).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
-        verify(routingActivator).activate(helperContentViewParented2.routing, helperContentViewParented2.nodes)
-        verify(routingActivator).activate(helperContentExternal1.routing, helperContentExternal1.nodes)
+        verify(routingActivator).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
+        verify(routingActivator).activate(
+            helperContentViewParented2.routing,
+            helperContentViewParented2.nodes
+        )
+        verify(routingActivator).activate(
+            helperContentExternal1.routing,
+            helperContentExternal1.nodes
+        )
 
         // As these were INACTIVE and shouldn't be reactivated after WakeUp
-        verify(routingActivator, never()).activate(helperContentViewParented3.routing, helperContentViewParented3.nodes)
-        verify(routingActivator, never()).activate(helperContentExternal2.routing, helperContentExternal2.nodes)
+        verify(routingActivator, never()).activate(
+            helperContentViewParented3.routing,
+            helperContentViewParented3.nodes
+        )
+        verify(routingActivator, never()).activate(
+            helperContentExternal2.routing,
+            helperContentExternal2.nodes
+        )
     }
 
     /**
@@ -394,9 +490,11 @@ class RoutingStatePoolTest {
     @Test
     fun `On Add, Node factories are invoked`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing)
+            )
+        )
         helperContentViewParented1.nodeFactories.forEach {
             verify(it).invoke()
         }
@@ -405,10 +503,12 @@ class RoutingStatePoolTest {
     @Test
     fun `On Add TWICE, Node factories are NOT invoked again`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentViewParented1.routing)
+            )
+        )
         helperContentViewParented1.nodeFactories.forEach {
             verify(it, times(1)).invoke()
         }
@@ -426,9 +526,11 @@ class RoutingStatePoolTest {
     @Ignore("The whole test suite should be refactored.")
     fun `On Add, Nodes that are created are attached with empty Bundles`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing)
+            )
+        )
         helperContentViewParented1.nodes.forEach {
             verify(parentNode).attachChildNode(it)
         }
@@ -446,10 +548,12 @@ class RoutingStatePoolTest {
     @Ignore("The whole test suite should be refactored.")
     fun `On Add TWICE, Nodes are NOT added again`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentViewParented1.routing)
+            )
+        )
         helperContentViewParented1.nodes.forEach {
             verify(parentNode, times(1)).attachChildNode(it)
         }
@@ -465,9 +569,11 @@ class RoutingStatePoolTest {
     @Test
     fun `On Add, associated RoutingAction is not yet executed`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing)
+            )
+        )
         verify(helperContentViewParented1.resolution, never()).execute()
     }
     // endregion
@@ -476,31 +582,40 @@ class RoutingStatePoolTest {
     @Test
     fun `On Activate BEFORE WakeUp, associated RoutingAction is NOT yet executed`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         verify(helperContentViewParented1.resolution, never()).execute()
     }
 
     @Test
     fun `On Activate BEFORE WakeUp, attachChildView() is NOT yet called on associated Nodes that are view-parented`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
 
-        verify(routingActivator, never()).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator, never()).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
 
     @Test
     fun `On Activate BEFORE WakeUp, associated RoutingAction is executed AUTOMATICALLY AFTER next WakeUp`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         pool.accept(WakeUp())
         verify(helperContentViewParented1.resolution).execute()
     }
@@ -508,22 +623,29 @@ class RoutingStatePoolTest {
     @Test
     fun `On Activate BEFORE WakeUp, attachChildView() is called AUTOMATICALLY AFTER next WakeUp on associated Nodes that are view-parented`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         pool.accept(WakeUp())
-        verify(routingActivator).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
 
     @Test
     fun `On Activate AFTER WakeUp, associated RoutingAction is executed`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         verify(helperContentViewParented1.resolution).execute()
     }
 
@@ -531,26 +653,35 @@ class RoutingStatePoolTest {
     fun `On Activate AFTER WakeUp, attachChildView() is called on associated Nodes`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
 
 
-        verify(routingActivator).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
 
     @Test
     fun `On Activate on ALREADY ACTIVE configuration, associated RoutingAction is NOT executed again`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
-        pool.accept(Transaction.from(
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
+        pool.accept(
+            Transaction.from(
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         verify(helperContentViewParented1.resolution, times(1)).execute()
     }
 
@@ -558,14 +689,21 @@ class RoutingStatePoolTest {
     fun `On Activate on ALREADY ACTIVE configuration, attachChildView() is NOT called again`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
-        pool.accept(Transaction.from(
-            Activate(helperContentViewParented1.routing)
-        ))
-        verify(routingActivator, times(1)).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
+        pool.accept(
+            Transaction.from(
+                Activate(helperContentViewParented1.routing)
+            )
+        )
+        verify(routingActivator, times(1)).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
     // endregion
 
@@ -573,10 +711,12 @@ class RoutingStatePoolTest {
     @Test
     fun `On Deactivate, cleanup() is called on associated RoutingAction`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Deactivate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Deactivate(helperContentViewParented1.routing)
+            )
+        )
         verify(helperContentViewParented1.resolution).cleanup()
     }
 
@@ -592,10 +732,12 @@ class RoutingStatePoolTest {
     @Ignore("The whole test suite should be refactored.")
     fun `On Deactivate, saveViewState() is called on associated Nodes`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Deactivate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Deactivate(helperContentViewParented1.routing)
+            )
+        )
         helperContentViewParented1.nodes.forEach {
             verify(it).saveViewState()
         }
@@ -613,21 +755,28 @@ class RoutingStatePoolTest {
     @Ignore("The whole test suite should be refactored.")
     fun `On Deactivate, detachChildView() is called on associated Nodes that are view-parented`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Deactivate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Deactivate(helperContentViewParented1.routing)
+            )
+        )
 
-        verify(routingActivator).deactivate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator).deactivate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
 
     @Test
     fun `On Deactivate, Node references are kept`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Deactivate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Deactivate(helperContentViewParented1.routing)
+            )
+        )
         val configurationContext = pool.state.pool[helperContentViewParented1.routing]
         assertEquals(true, configurationContext is Resolved)
         assertEquals(helperContentViewParented1.nodes, (configurationContext as? Resolved)?.nodes)
@@ -650,10 +799,12 @@ class RoutingStatePoolTest {
     @Test
     fun `On Deactivate, Node routing is removed from pendingDeactivate`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Deactivate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Deactivate(helperContentViewParented1.routing)
+            )
+        )
 
         assertEquals(true, pool.state.pendingDeactivate.isEmpty())
     }
@@ -662,15 +813,23 @@ class RoutingStatePoolTest {
     @Test
     fun `On Remove, all of its Nodes are detached regardless of view-parenting mode`() {
         createEmptyPool()
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Remove(helperContentViewParented1.routing),
-            Remove(helperContentExternal1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Remove(helperContentViewParented1.routing),
+                Remove(helperContentExternal1.routing)
+            )
+        )
 
-        verify(routingActivator).remove(helperContentViewParented1.routing, helperContentViewParented1.nodes)
-        verify(routingActivator).remove(helperContentExternal1.routing, helperContentExternal1.nodes)
+        verify(routingActivator).remove(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
+        verify(routingActivator).remove(
+            helperContentExternal1.routing,
+            helperContentExternal1.nodes
+        )
     }
     // endregion
 
@@ -679,11 +838,13 @@ class RoutingStatePoolTest {
     fun `On Sleep after WakeUp, cleanup() is called on associated RoutingAction`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         clearInvocations(parentNode)
         pool.accept(Sleep())
 
@@ -703,11 +864,13 @@ class RoutingStatePoolTest {
     fun `On Sleep after WakeUp, saveViewState() is called on every ACTIVE node`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         clearInvocations(parentNode)
         pool.accept(Sleep())
 
@@ -729,15 +892,20 @@ class RoutingStatePoolTest {
     fun `On Sleep after WakeUp, detachChildView() is called on every ACTIVE node that are view-parented`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         clearInvocations(parentNode)
         pool.accept(Sleep())
 
-        verify(routingActivator).deactivate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator).deactivate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
     // endregion
 
@@ -746,11 +914,13 @@ class RoutingStatePoolTest {
     fun `On WakeUp after Sleep, execute() is called on associated RoutingAction`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         pool.accept(Sleep())
         clearInvocations(helperContentViewParented1.resolution)
         pool.accept(WakeUp())
@@ -762,16 +932,21 @@ class RoutingStatePoolTest {
     fun `On WakeUp after Sleep, attachChildView() is called on every ACTIVE node that are view-parented`() {
         createEmptyPool()
         pool.accept(WakeUp())
-        pool.accept(Transaction.from(
-            Add(helperContentViewParented1.routing),
-            Add(helperContentExternal1.routing),
-            Activate(helperContentViewParented1.routing)
-        ))
+        pool.accept(
+            Transaction.from(
+                Add(helperContentViewParented1.routing),
+                Add(helperContentExternal1.routing),
+                Activate(helperContentViewParented1.routing)
+            )
+        )
         pool.accept(Sleep())
         clearInvocations(routingActivator)
         pool.accept(WakeUp())
 
-        verify(routingActivator).activate(helperContentViewParented1.routing, helperContentViewParented1.nodes)
+        verify(routingActivator).activate(
+            helperContentViewParented1.routing,
+            helperContentViewParented1.nodes
+        )
     }
     // endregion
 }
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/ActorTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/ActorTest.kt
index 4cf7beba6..140a3fa85 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/ActorTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/ActorTest.kt
@@ -13,17 +13,17 @@ import com.badoo.ribs.routing.state.changeset.TransitionDescriptor
 import com.badoo.ribs.routing.state.feature.state.WorkingState
 import com.badoo.ribs.routing.transition.TransitionElement
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.MethodSource
+import org.mockito.internal.verification.VerificationModeFactory.times
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.MethodSource
-import org.mockito.internal.verification.VerificationModeFactory.times
 import java.util.stream.Stream
 
 internal class ActorTest {
@@ -44,7 +44,7 @@ internal class ActorTest {
             on { actionFactory } doReturn ElementsActionFactoryStub()
             on { routing } doReturn mock()
         }
-        val transaction = Transaction.RoutingChange<AnyConfiguration>(
+        val transaction = Transaction.RoutingChange(
             changeset = listOf(command),
             descriptor = mock()
         )
@@ -78,7 +78,7 @@ internal class ActorTest {
             on { actionFactory } doReturn ElementsActionFactoryStub()
             on { routing } doReturn mock()
         }
-        val transaction = Transaction.RoutingChange<AnyConfiguration>(
+        val transaction = Transaction.RoutingChange(
             changeset = listOf(command),
             descriptor = newDescriptor
         )
@@ -90,7 +90,7 @@ internal class ActorTest {
         verify(pendingTransition).schedule()
     }
 
-    @ParameterizedTest()
+    @ParameterizedTest
     @MethodSource("executePendingTestArguments")
     fun `WHEN a ExecutePendingTransition is accepted THEN pendingTransition is correctly handled`(
         activationState: RoutingContext.ActivationState,
@@ -122,7 +122,7 @@ internal class ActorTest {
         }
     }
 
-    @ParameterizedTest()
+    @ParameterizedTest
     @MethodSource("ongoingTransitionInteractionsTestArguments")
     fun `GIVEN an ongoingTransition in the state WHEN a RoutingChange is accepted THEN existing ongoingTransition is correctly handled`(
         isContinuation: Boolean,
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/OngoingTransitionTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/OngoingTransitionTest.kt
index db84aa1a2..957bfb583 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/OngoingTransitionTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/OngoingTransitionTest.kt
@@ -8,11 +8,11 @@ import com.badoo.ribs.routing.transition.TransitionDirection
 import com.badoo.ribs.routing.transition.TransitionElement
 import com.badoo.ribs.routing.transition.progress.MultiProgressEvaluator
 import com.badoo.ribs.routing.transition.progress.SingleProgressEvaluator
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
-import org.junit.Test
 import java.util.UUID
 
 class OngoingTransitionTest {
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/PendingTransitionTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/PendingTransitionTest.kt
index 2c21d2fda..1885df084 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/PendingTransitionTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/PendingTransitionTest.kt
@@ -6,10 +6,13 @@ import com.badoo.ribs.routing.state.feature.RoutingStatePool.Effect.Transition.R
 import com.badoo.ribs.routing.state.feature.RoutingStatePool.Effect.Transition.RequestTransition
 import com.badoo.ribs.routing.state.feature.Transaction.InternalTransaction.ExecutePendingTransition
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import org.mockito.kotlin.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
-
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class PendingTransitionTest {
 
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/RoutingStatePoolTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/RoutingStatePoolTest.kt
index 247e9e04a..23f9fadfc 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/RoutingStatePoolTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/RoutingStatePoolTest.kt
@@ -2,10 +2,10 @@ package com.badoo.ribs.routing.state.feature
 
 import com.badoo.ribs.core.helper.AnyConfiguration
 import com.badoo.ribs.routing.state.feature.state.WorkingState
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class RoutingStatePoolTest {
 
@@ -37,7 +37,11 @@ class RoutingStatePoolTest {
         val pendingTransition: PendingTransition<AnyConfiguration> = mock()
         val routingStatePool = TestRoutingStatePool()
 
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.RequestTransition(pendingTransition))
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.RequestTransition(
+                pendingTransition
+            )
+        )
 
         assertThat(routingStatePool.state.pendingTransitions.first()).isEqualTo(pendingTransition)
     }
@@ -50,7 +54,11 @@ class RoutingStatePoolTest {
         )
         val routingStatePool = TestRoutingStatePool(state)
 
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.RemovePendingTransition(pendingTransition))
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.RemovePendingTransition(
+                pendingTransition
+            )
+        )
 
         assertThat(routingStatePool.state.pendingTransitions).isEmpty()
     }
@@ -60,7 +68,11 @@ class RoutingStatePoolTest {
         val ongoingTransition: OngoingTransition<AnyConfiguration> = mock()
         val routingStatePool = TestRoutingStatePool()
 
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.TransitionStarted(ongoingTransition))
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.TransitionStarted(
+                ongoingTransition
+            )
+        )
 
         assertThat(routingStatePool.state.ongoingTransitions.first()).isEqualTo(ongoingTransition)
     }
@@ -73,7 +85,11 @@ class RoutingStatePoolTest {
         )
         val routingStatePool = TestRoutingStatePool(state)
 
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.TransitionFinished(ongoingTransition))
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.TransitionFinished(
+                ongoingTransition
+            )
+        )
 
         assertThat(routingStatePool.state.ongoingTransitions).isEmpty()
     }
@@ -87,8 +103,16 @@ class RoutingStatePoolTest {
         )
         val routingStatePool = TestRoutingStatePool(state)
 
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.RequestTransition(pendingTransition2))
-        routingStatePool.testEvent(RoutingStatePool.Effect.Transition.RemovePendingTransition(pendingTransition))
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.RequestTransition(
+                pendingTransition2
+            )
+        )
+        routingStatePool.testEvent(
+            RoutingStatePool.Effect.Transition.RemovePendingTransition(
+                pendingTransition
+            )
+        )
 
         assertThat(routingStatePool.state.pendingTransitions).contains(pendingTransition2)
         assertThat(routingStatePool.state.pendingTransitions).doesNotContain(pendingTransition)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/TestRoutingStatePool.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/TestRoutingStatePool.kt
index 87e99f003..c650a14d0 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/TestRoutingStatePool.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/TestRoutingStatePool.kt
@@ -8,13 +8,14 @@ import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 
-internal class TestRoutingStatePool(initialState: WorkingState<AnyConfiguration>? = null) : RoutingStatePool<AnyConfiguration>(
-    timeCapsule = createTimeCapsule(initialState),
-    resolver = mock(),
-    activator = mock(),
-    parentNode = mock(),
-    transitionHandler = mock(),
-) {
+internal class TestRoutingStatePool(initialState: WorkingState<AnyConfiguration>? = null) :
+    RoutingStatePool<AnyConfiguration>(
+        timeCapsule = createTimeCapsule(initialState),
+        resolver = mock(),
+        activator = mock(),
+        parentNode = mock(),
+        transitionHandler = mock(),
+    ) {
 
     fun testEvent(event: Effect<AnyConfiguration>) {
         emitEvent(event)
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/BackStackOperationHelper.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/BackStackOperationHelper.kt
index 408ba0b09..3e3db1946 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/BackStackOperationHelper.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/BackStackOperationHelper.kt
@@ -3,7 +3,8 @@ package com.badoo.ribs.routing.state.feature.operation
 import com.badoo.ribs.core.helper.TestRouter
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.history.RoutingHistoryElement
-import com.badoo.ribs.routing.history.RoutingHistoryElement.Activation.*
+import com.badoo.ribs.routing.history.RoutingHistoryElement.Activation.ACTIVE
+import com.badoo.ribs.routing.history.RoutingHistoryElement.Activation.INACTIVE
 import com.badoo.ribs.routing.source.backstack.Elements
 
 fun List<TestRouter.Configuration>.asBackStackElements(
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/PopTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/PopTest.kt
index 2d8620845..f3c611e11 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/PopTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/PopTest.kt
@@ -65,7 +65,7 @@ class PopTest {
     @Test
     fun `invoke remove last overlay when overlay on top`() {
         //last element with two overlays
-        val backStack = listOf<RoutingHistoryElement<Configuration>>(
+        val backStack = listOf(
             RoutingHistoryElement(
                 routing = Routing(C1 as Configuration)
             ),
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/RemoveTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/RemoveTest.kt
index c8c586b3f..dfeb23338 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/RemoveTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/routing/state/feature/operation/RemoveTest.kt
@@ -19,40 +19,40 @@ class RemoveTest {
 
     private lateinit var remove: Remove<Configuration>
 
-    val elements: Elements<Configuration> = listOf<RoutingHistoryElement<Configuration>>(
+    val elements: Elements<Configuration> = listOf(
         RoutingHistoryElement(
-            routing = Routing<Configuration>(
+            routing = Routing(
                 identifier = Identifier(id = 10),
                 configuration = C1
             )
         ),
         RoutingHistoryElement(
-            routing = Routing<Configuration>(
+            routing = Routing(
                 identifier = Identifier(id = 20),
                 configuration = C2
             ),
             overlays = listOf(
-                Routing<Configuration>(
+                Routing(
                     identifier = Identifier(id = 201),
                     configuration = O1
                 )
             )
         ),
         RoutingHistoryElement(
-            routing = Routing<Configuration>(
+            routing = Routing(
                 identifier = Identifier(id = 30),
                 configuration = C3
             ),
             overlays = listOf(
-                Routing<Configuration>(
+                Routing(
                     identifier = Identifier(id = 301),
                     configuration = O1
                 ),
-                Routing<Configuration>(
+                Routing(
                     identifier = Identifier(id = 302),
                     configuration = O2
                 ),
-                Routing<Configuration>(
+                Routing(
                     identifier = Identifier(id = 303),
                     configuration = O3
                 )
@@ -113,12 +113,14 @@ class RemoveTest {
         remove = Remove(Identifier(id = 302))
 
         val result = remove.invoke(elements)
-        val expected = listOf(elements[0], elements[1], elements[2].copy(
-            overlays = listOf(
-                elements[2].overlays[0],
-                elements[2].overlays[2]
+        val expected = listOf(
+            elements[0], elements[1], elements[2].copy(
+                overlays = listOf(
+                    elements[2].overlays[0],
+                    elements[2].overlays[2]
+                )
             )
-        ))
+        )
 
         assertThat(result).isEqualTo(expected)
     }
diff --git a/libraries/rib-base/src/test/java/com/badoo/ribs/store/RetainedInstanceStoreTest.kt b/libraries/rib-base/src/test/java/com/badoo/ribs/store/RetainedInstanceStoreTest.kt
index 43baff6ba..306ae361e 100644
--- a/libraries/rib-base/src/test/java/com/badoo/ribs/store/RetainedInstanceStoreTest.kt
+++ b/libraries/rib-base/src/test/java/com/badoo/ribs/store/RetainedInstanceStoreTest.kt
@@ -58,7 +58,8 @@ class RetainedInstanceStoreTest {
         val obj = Any()
         RetainedInstanceStore.get(identifier) { obj }
 
-        val isRetained = RetainedInstanceStore.isRetainedByOwner(Rib.Identifier(UUID.randomUUID()), obj)
+        val isRetained =
+            RetainedInstanceStore.isRetainedByOwner(Rib.Identifier(UUID.randomUUID()), obj)
 
         assertFalse(isRetained)
     }
diff --git a/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/core/plugin/utils/debug/DebugControlsHost.kt b/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/core/plugin/utils/debug/DebugControlsHost.kt
index 815ea8910..37bd9fcca 100644
--- a/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/core/plugin/utils/debug/DebugControlsHost.kt
+++ b/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/core/plugin/utils/debug/DebugControlsHost.kt
@@ -4,11 +4,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
-import com.badoo.ribs.debugutils.R
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.debug.TreePrinter
+import com.badoo.ribs.debugutils.R
 
 class DebugControlsHost(
     viewGroupForChildren: (() -> ViewGroup),
diff --git a/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/debug/TreePrinter.kt b/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/debug/TreePrinter.kt
index fd8b06af7..901f364a7 100644
--- a/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/debug/TreePrinter.kt
+++ b/libraries/rib-debug-utils/src/main/java/com/badoo/ribs/debug/TreePrinter.kt
@@ -6,7 +6,8 @@ import com.badoo.ribs.util.RIBs
 object TreePrinter {
 
     val FORMAT_SIMPLE: (Node<*>) -> String = { it.javaClass.simpleName }
-    val FORMAT_SIMPLE_INSTANCE: (Node<*>) -> String = { "${it.javaClass.simpleName} @${System.identityHashCode(it)}"}
+    val FORMAT_SIMPLE_INSTANCE: (Node<*>) -> String =
+        { "${it.javaClass.simpleName} @${System.identityHashCode(it)}" }
 
     private const val ACTIVE = "* "
     private const val ARM_RIGHT = "└── "
diff --git a/libraries/rib-debug-utils/src/main/res/layout/debug_root.xml b/libraries/rib-debug-utils/src/main/res/layout/debug_root.xml
index 550dd165e..d0903eb53 100644
--- a/libraries/rib-debug-utils/src/main/res/layout/debug_root.xml
+++ b/libraries/rib-debug-utils/src/main/res/layout/debug_root.xml
@@ -3,9 +3,9 @@
     android:id="@+id/debug_switcher"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:layout_gravity="top"
-    android:gravity="top">
+    android:gravity="top"
+    android:orientation="vertical">
 
     <Button
         android:id="@+id/debug_tree"
diff --git a/libraries/rib-mvicore/src/main/java/com/badoo/ribs/mvicore/ChildAwareExt.kt b/libraries/rib-mvicore/src/main/java/com/badoo/ribs/mvicore/ChildAwareExt.kt
index 9b6c2333a..9afef23f0 100644
--- a/libraries/rib-mvicore/src/main/java/com/badoo/ribs/mvicore/ChildAwareExt.kt
+++ b/libraries/rib-mvicore/src/main/java/com/badoo/ribs/mvicore/ChildAwareExt.kt
@@ -1,10 +1,10 @@
 package com.badoo.ribs.mvicore
 
 import androidx.lifecycle.Lifecycle
+import com.badoo.binder.Binder
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.mvicore.android.lifecycle.resumePause
 import com.badoo.mvicore.android.lifecycle.startStop
-import com.badoo.binder.Binder
 import com.badoo.ribs.clienthelper.childaware.ChildAwareScope
 import com.badoo.ribs.core.Rib
 
diff --git a/libraries/rib-portal-rx2/.gitignore b/libraries/rib-portal-rx3/.gitignore
similarity index 100%
rename from libraries/rib-portal-rx2/.gitignore
rename to libraries/rib-portal-rx3/.gitignore
diff --git a/libraries/rib-portal-rx2/build.gradle b/libraries/rib-portal-rx3/build.gradle
similarity index 87%
rename from libraries/rib-portal-rx2/build.gradle
rename to libraries/rib-portal-rx3/build.gradle
index 21b2583bb..b48b791a7 100644
--- a/libraries/rib-portal-rx2/build.gradle
+++ b/libraries/rib-portal-rx3/build.gradle
@@ -1,7 +1,7 @@
 configureAndroidLibrary(project)
 
 android {
-    namespace 'com.badoo.ribs.portal.rx2'
+    namespace 'com.badoo.ribs.portal.rx3'
 }
 
 dependencies {
@@ -13,11 +13,11 @@ dependencies {
     implementation deps.external.mviCore
     implementation deps.external.mviCoreAndroid
     implementation deps.external.mviCoreBinder
-    implementation deps.external.rxrelay2
-    implementation deps.external.rxjava2
+    implementation deps.external.rxrelay3
+    implementation deps.external.rxjava3
 
     api project(":libraries:rib-portal")
-    implementation project(':libraries:rib-rx2')
+    implementation project(':libraries:rib-rx3')
 
     junitTestImplementation(project)
     testImplementation deps.android.annotations
diff --git a/libraries/rib-portal-rx2/consumer-rules.pro b/libraries/rib-portal-rx3/consumer-rules.pro
similarity index 100%
rename from libraries/rib-portal-rx2/consumer-rules.pro
rename to libraries/rib-portal-rx3/consumer-rules.pro
diff --git a/libraries/rib-portal-rx2/detekt-baseline.xml b/libraries/rib-portal-rx3/detekt-baseline.xml
similarity index 100%
rename from libraries/rib-portal-rx2/detekt-baseline.xml
rename to libraries/rib-portal-rx3/detekt-baseline.xml
diff --git a/libraries/rib-portal-rx2/gradle.properties b/libraries/rib-portal-rx3/gradle.properties
similarity index 100%
rename from libraries/rib-portal-rx2/gradle.properties
rename to libraries/rib-portal-rx3/gradle.properties
diff --git a/libraries/rib-portal-rx2/proguard-rules.pro b/libraries/rib-portal-rx3/proguard-rules.pro
similarity index 100%
rename from libraries/rib-portal-rx2/proguard-rules.pro
rename to libraries/rib-portal-rx3/proguard-rules.pro
diff --git a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2Portal.kt b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3Portal.kt
similarity index 73%
rename from libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2Portal.kt
rename to libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3Portal.kt
index ebe395a9b..800e63bb2 100644
--- a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2Portal.kt
+++ b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3Portal.kt
@@ -1,13 +1,13 @@
-package com.badoo.ribs.portal.rx2
+package com.badoo.ribs.portal.rx3
 
 import com.badoo.ribs.annotation.ExperimentalApi
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.portal.Portal
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 
 @ExperimentalApi
-interface Rx2Portal : Portal {
+interface Rx3Portal : Portal {
 
     fun showDefault(): Single<Rib>
     fun showInPortal(ancestryInfo: AncestryInfo): Single<Rib>
diff --git a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalBuilder.kt b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalBuilder.kt
similarity index 84%
rename from libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalBuilder.kt
rename to libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalBuilder.kt
index 577ca22a0..f05ec07db 100644
--- a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalBuilder.kt
+++ b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalBuilder.kt
@@ -1,4 +1,4 @@
-package com.badoo.ribs.portal.rx2
+package com.badoo.ribs.portal.rx3
 
 import com.badoo.ribs.annotation.ExperimentalApi
 import com.badoo.ribs.core.modality.BuildParams
@@ -10,17 +10,17 @@ import com.badoo.ribs.portal.PortalRouter.Configuration
 import com.badoo.ribs.routing.source.backstack.BackStack
 
 @ExperimentalApi
-class Rx2PortalBuilder(
+class Rx3PortalBuilder(
     dependency: Portal.Dependency
-) : BasePortalBuilder<Rx2Portal>(dependency) {
+) : BasePortalBuilder<Rx3Portal>(dependency) {
 
     override fun createNode(
         buildParams: BuildParams<Nothing?>,
         interactor: PortalInteractor,
         router: PortalRouter,
         backStack: BackStack<Configuration>
-    ): Rx2Portal =
-        Rx2PortalNode(
+    ): Rx3Portal =
+        Rx3PortalNode(
             buildParams = buildParams,
             backStack = backStack,
             plugins = listOf(
diff --git a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalNode.kt b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalNode.kt
similarity index 85%
rename from libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalNode.kt
rename to libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalNode.kt
index 8fefbfb34..04549451f 100644
--- a/libraries/rib-portal-rx2/src/main/java/com/badoo/ribs/portal/rx2/Rx2PortalNode.kt
+++ b/libraries/rib-portal-rx3/src/main/java/com/badoo/ribs/portal/rx3/Rx3PortalNode.kt
@@ -1,4 +1,4 @@
-package com.badoo.ribs.portal.rx2
+package com.badoo.ribs.portal.rx3
 
 import com.badoo.ribs.annotation.ExperimentalApi
 import com.badoo.ribs.core.Rib
@@ -9,11 +9,11 @@ import com.badoo.ribs.portal.PortalRouter.Configuration
 import com.badoo.ribs.portal.PortalRouter.Configuration.Content
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
-import io.reactivex.Single
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
+import io.reactivex.rxjava3.core.Single
 
 @ExperimentalApi
-internal class Rx2PortalNode(
+internal class Rx3PortalNode(
     buildParams: BuildParams<*>,
     private val backStack: BackStack<Configuration>,
     plugins: List<Plugin>
@@ -21,7 +21,7 @@ internal class Rx2PortalNode(
     buildParams = buildParams,
     viewFactory = null,
     plugins = plugins
-), Rx2Portal {
+), Rx3Portal {
 
     override fun showDefault(): Single<Rib> =
         attachWorkflow {
diff --git a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalBuilder.kt b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalBuilder.kt
index 0c83e9a8f..330944afa 100644
--- a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalBuilder.kt
+++ b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalBuilder.kt
@@ -43,7 +43,7 @@ abstract class BasePortalBuilder<T : Portal>(
     ): T
 }
 
-class PortalBuilder(dependency: Portal.Dependency): BasePortalBuilder<Portal>(dependency) {
+class PortalBuilder(dependency: Portal.Dependency) : BasePortalBuilder<Portal>(dependency) {
     override fun createNode(
         buildParams: BuildParams<Nothing?>,
         interactor: PortalInteractor,
diff --git a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalInteractor.kt b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalInteractor.kt
index c9a468fbe..da69366c2 100644
--- a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalInteractor.kt
+++ b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalInteractor.kt
@@ -20,10 +20,22 @@ class PortalInteractor(
 ), Portal.OtherSide {
 
     override fun showContent(remoteNode: Node<*>, remoteConfiguration: Parcelable) {
-        backStack.push(Content.Portal(remoteNode.ancestryInfo.routingChain + Routing(remoteConfiguration)))
+        backStack.push(
+            Content.Portal(
+                remoteNode.ancestryInfo.routingChain + Routing(
+                    remoteConfiguration
+                )
+            )
+        )
     }
 
     override fun showOverlay(remoteNode: Node<*>, remoteConfiguration: Parcelable) {
-        backStack.pushOverlay(Overlay.Portal(remoteNode.ancestryInfo.routingChain + Routing(remoteConfiguration)))
+        backStack.pushOverlay(
+            Overlay.Portal(
+                remoteNode.ancestryInfo.routingChain + Routing(
+                    remoteConfiguration
+                )
+            )
+        )
     }
 }
diff --git a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalNode.kt b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalNode.kt
index ac9265066..3d035f7c7 100644
--- a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalNode.kt
+++ b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalNode.kt
@@ -11,6 +11,4 @@ internal class PortalNode(
     buildParams = buildParams,
     viewFactory = null,
     plugins = plugins
-), Portal {
-
-}
+), Portal
diff --git a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalRouter.kt b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalRouter.kt
index 9188380fc..f8c75043d 100644
--- a/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalRouter.kt
+++ b/libraries/rib-portal/src/main/java/com/badoo/ribs/portal/PortalRouter.kt
@@ -24,7 +24,7 @@ class PortalRouter(
     routingSource: RoutingSource<Configuration>,
     private val defaultResolution: Resolution,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
@@ -32,11 +32,15 @@ class PortalRouter(
     @ExperimentalApi
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
-            @Parcelize object Default : Content()
-            @Parcelize data class Portal(val routingChain: List<Routing<out Parcelable>>) : Content()
+            @Parcelize
+            data object Default : Content()
+            @Parcelize
+            data class Portal(val routingChain: List<Routing<out Parcelable>>) : Content()
         }
+
         sealed class Overlay : Configuration() {
-            @Parcelize data class Portal(val routingChain: List<Routing<out Parcelable>>) : Overlay()
+            @Parcelize
+            data class Portal(val routingChain: List<Routing<out Parcelable>>) : Overlay()
         }
     }
 
@@ -69,7 +73,8 @@ class PortalRouter(
 
             rib.node.plugin<RoutingResolver<Parcelable>>()?.let {
                 targetRouter = it
-            } ?: throw IllegalStateException("Invalid chain of parents. This should never happen. Chain: $this")
+            }
+                ?: throw IllegalStateException("Invalid chain of parents. This should never happen. Chain: $this")
 
             resolution = targetRouter.resolve(element as Routing<Parcelable>)
         }
diff --git a/libraries/rib-portal/src/test/java/com/badoo/ribs/portal/TestRouter.kt b/libraries/rib-portal/src/test/java/com/badoo/ribs/portal/TestRouter.kt
index f7aba97f5..4bc9be1f7 100644
--- a/libraries/rib-portal/src/test/java/com/badoo/ribs/portal/TestRouter.kt
+++ b/libraries/rib-portal/src/test/java/com/badoo/ribs/portal/TestRouter.kt
@@ -7,8 +7,8 @@ import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.test.emptyBuildParams
-import org.mockito.kotlin.mock
 import kotlinx.parcelize.Parcelize
+import org.mockito.kotlin.mock
 
 class TestRouter(
     buildParams: BuildParams<Nothing?> = emptyBuildParams(),
@@ -32,17 +32,51 @@ class TestRouter(
 
     sealed class Configuration : Parcelable {
         // Content
-        @Parcelize object C1 : Configuration() { override fun toString(): String = "C1" }
-        @Parcelize object C2 : Configuration() { override fun toString(): String = "C2" }
-        @Parcelize object C3 : Configuration() { override fun toString(): String = "C3" }
-        @Parcelize object C4 : Configuration() { override fun toString(): String = "C4" }
-        @Parcelize object C5 : Configuration() { override fun toString(): String = "C5" }
-        @Parcelize data class C6(val i: Int) : Configuration() { override fun toString(): String = "C6" }
+        @Parcelize
+        object C1 : Configuration() {
+            override fun toString(): String = "C1"
+        }
+
+        @Parcelize
+        object C2 : Configuration() {
+            override fun toString(): String = "C2"
+        }
+
+        @Parcelize
+        object C3 : Configuration() {
+            override fun toString(): String = "C3"
+        }
+
+        @Parcelize
+        object C4 : Configuration() {
+            override fun toString(): String = "C4"
+        }
+
+        @Parcelize
+        object C5 : Configuration() {
+            override fun toString(): String = "C5"
+        }
+
+        @Parcelize
+        data class C6(val i: Int) : Configuration() {
+            override fun toString(): String = "C6"
+        }
 
         // Overlay
-        @Parcelize object O1 : Configuration() { override fun toString(): String = "O1" }
-        @Parcelize object O2 : Configuration() { override fun toString(): String = "O2" }
-        @Parcelize object O3 : Configuration() { override fun toString(): String = "O3" }
+        @Parcelize
+        object O1 : Configuration() {
+            override fun toString(): String = "O1"
+        }
+
+        @Parcelize
+        object O2 : Configuration() {
+            override fun toString(): String = "O2"
+        }
+
+        @Parcelize
+        object O3 : Configuration() {
+            override fun toString(): String = "O3"
+        }
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/libraries/rib-rx2/gradle.properties b/libraries/rib-rx2/gradle.properties
deleted file mode 100644
index 7bdbc5b5c..000000000
--- a/libraries/rib-rx2/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-POM_NAME=RIBs (Rx2 plugin)
-POM_ARTIFACT_ID=rib-rx2
-POM_PACKAGING=android
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/AnyConfiguration.kt b/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/AnyConfiguration.kt
deleted file mode 100644
index 5ad8656bb..000000000
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/AnyConfiguration.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.badoo.ribs.rx2.clienthelper.conector.helpers
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-object AnyConfiguration : Parcelable { override fun toString(): String = "AnyConfiguration" }
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestRib.kt b/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestRib.kt
deleted file mode 100644
index e1290ab42..000000000
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestRib.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.badoo.ribs.rx2.clienthelper.conector.helpers
-
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Input
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-
-interface Rx2ConnectableTestRib : Connectable<Input, Output> {
-
-    sealed class Input
-
-    sealed class Output {
-        object Output1 : Output()
-        object Output2 : Output()
-        object Output3 : Output()
-    }
-}
diff --git a/libraries/rib-rx2/.gitignore b/libraries/rib-rx3/.gitignore
similarity index 100%
rename from libraries/rib-rx2/.gitignore
rename to libraries/rib-rx3/.gitignore
diff --git a/libraries/rib-rx2/build.gradle b/libraries/rib-rx3/build.gradle
similarity index 90%
rename from libraries/rib-rx2/build.gradle
rename to libraries/rib-rx3/build.gradle
index fa88c0f11..1d917f8c4 100644
--- a/libraries/rib-rx2/build.gradle
+++ b/libraries/rib-rx3/build.gradle
@@ -1,12 +1,12 @@
 configureAndroidLibrary(project)
 
 android {
-    namespace 'com.badoo.ribs.rx2'
+    namespace 'com.badoo.ribs.rx3'
 }
 
 dependencies {
-    api deps.external.rxrelay2
-    api deps.external.rxjava2
+    api deps.external.rxrelay3
+    api deps.external.rxjava3
 
     api project(":libraries:rib-base")
 
diff --git a/libraries/rib-rx2/consumer-rules.pro b/libraries/rib-rx3/consumer-rules.pro
similarity index 100%
rename from libraries/rib-rx2/consumer-rules.pro
rename to libraries/rib-rx3/consumer-rules.pro
diff --git a/libraries/rib-rx2/detekt-baseline.xml b/libraries/rib-rx3/detekt-baseline.xml
similarity index 100%
rename from libraries/rib-rx2/detekt-baseline.xml
rename to libraries/rib-rx3/detekt-baseline.xml
diff --git a/libraries/rib-rx3/gradle.properties b/libraries/rib-rx3/gradle.properties
new file mode 100644
index 000000000..d33b5e638
--- /dev/null
+++ b/libraries/rib-rx3/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=RIBs (Rx3 plugin)
+POM_ARTIFACT_ID=rib-rx3
+POM_PACKAGING=android
diff --git a/libraries/rib-rx2/lint-baseline.xml b/libraries/rib-rx3/lint-baseline.xml
similarity index 100%
rename from libraries/rib-rx2/lint-baseline.xml
rename to libraries/rib-rx3/lint-baseline.xml
diff --git a/libraries/rib-rx2/proguard-rules.pro b/libraries/rib-rx3/proguard-rules.pro
similarity index 100%
rename from libraries/rib-rx2/proguard-rules.pro
rename to libraries/rib-rx3/proguard-rules.pro
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/Disposables.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/Disposables.kt
similarity index 75%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/Disposables.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/Disposables.kt
index 236ec83b6..9a494e289 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/Disposables.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/Disposables.kt
@@ -1,9 +1,9 @@
-package com.badoo.ribs.rx2
+package com.badoo.ribs.rx3
 
 import com.badoo.ribs.core.plugin.NodeLifecycleAware
 import com.badoo.ribs.core.plugin.Plugin
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
 
 private class Disposables(disposables: List<Disposable>) : NodeLifecycleAware {
     private val disposable = CompositeDisposable(disposables)
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/adapter/Rx2.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/adapter/Rx3.kt
similarity index 61%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/adapter/Rx2.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/adapter/Rx3.kt
index 2df5b1218..6f41d6f02 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/adapter/Rx2.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/adapter/Rx3.kt
@@ -1,9 +1,9 @@
-package com.badoo.ribs.rx2.adapter
+package com.badoo.ribs.rx3.adapter
 
 import com.badoo.ribs.minimal.reactive.Source
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
-fun <T: Any> Source<T>.rx2(): Observable<T> =
+fun <T : Any> Source<T>.rx3(): Observable<T> =
     Observable.create { emitter ->
         val cancellable = observe { emitter.onNext(it) }
         emitter.setCancellable { cancellable.cancel() }
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/Connectable.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/Connectable.kt
similarity index 66%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/Connectable.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/Connectable.kt
index d1a5db787..7f66ccf49 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/Connectable.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/Connectable.kt
@@ -1,7 +1,7 @@
-package com.badoo.ribs.rx2.clienthelper.connector
+package com.badoo.ribs.rx3.clienthelper.connector
 
 import com.badoo.ribs.core.plugin.NodeLifecycleAware
-import com.jakewharton.rxrelay2.Relay
+import com.jakewharton.rxrelay3.Relay
 
 interface Connectable<Input, Output> : NodeLifecycleAware {
     val input: Relay<Input>
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/NodeConnector.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/NodeConnector.kt
similarity index 85%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/NodeConnector.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/NodeConnector.kt
index baeffe271..08ab2284e 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/clienthelper/connector/NodeConnector.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/clienthelper/connector/NodeConnector.kt
@@ -1,11 +1,10 @@
-package com.badoo.ribs.rx2.clienthelper.connector
+package com.badoo.ribs.rx3.clienthelper.connector
 
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
-import io.reactivex.Observer
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.core.Observer
 
-
-class NodeConnector<Input, Output>(
+class NodeConnector<Input, Output: Any>(
     override val input: Relay<Input> = PublishRelay.create(),
 ) : Connectable<Input, Output> {
 
@@ -17,7 +16,7 @@ class NodeConnector<Input, Output>(
 
     override val output: Relay<Output> = object : Relay<Output>() {
 
-        override fun subscribeActual(observer: Observer<in Output>?) {
+        override fun subscribeActual(observer: Observer<in Output>) {
             exhaust.subscribe(observer as Observer<Output>)
         }
 
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowActivity.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowActivity.kt
similarity index 83%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowActivity.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowActivity.kt
index 412f79ec4..38517a7c0 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowActivity.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowActivity.kt
@@ -1,10 +1,10 @@
-package com.badoo.ribs.rx2.workflows
+package com.badoo.ribs.rx3.workflows
 
 import android.content.Intent
 import android.os.Bundle
 import com.badoo.ribs.android.RibActivity
-import io.reactivex.Observable
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 
 abstract class RxWorkflowActivity : RibActivity() {
 
diff --git a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowNode.kt b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowNode.kt
similarity index 70%
rename from libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowNode.kt
rename to libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowNode.kt
index 833103b2d..cb97f7327 100644
--- a/libraries/rib-rx2/src/main/java/com/badoo/ribs/rx2/workflows/RxWorkflowNode.kt
+++ b/libraries/rib-rx3/src/main/java/com/badoo/ribs/rx3/workflows/RxWorkflowNode.kt
@@ -1,4 +1,4 @@
-package com.badoo.ribs.rx2.workflows
+package com.badoo.ribs.rx3.workflows
 
 import androidx.annotation.VisibleForTesting
 import com.badoo.ribs.core.Node
@@ -6,10 +6,10 @@ import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
-import com.jakewharton.rxrelay2.BehaviorRelay
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.Observable
-import io.reactivex.Single
+import com.jakewharton.rxrelay3.BehaviorRelay
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 
 open class RxWorkflowNode<V : RibView>(
     buildParams: BuildParams<*>,
@@ -21,13 +21,13 @@ open class RxWorkflowNode<V : RibView>(
     plugins = plugins
 ) {
 
-    private val childrenAttachesRelay: PublishRelay<Node<*>>? = PublishRelay.create()
-    val childrenAttaches: Observable<Node<*>>? = childrenAttachesRelay?.hide()
+    private val childrenAttachesRelay: PublishRelay<Node<*>> = PublishRelay.create()
+    val childrenAttaches: Observable<Node<*>> = childrenAttachesRelay.hide()
     val detachSignal: BehaviorRelay<Unit> = BehaviorRelay.create()
 
     override fun onAttachChildNode(child: Node<*>) {
         super.onAttachChildNode(child)
-        childrenAttachesRelay?.accept(child)
+        childrenAttachesRelay.accept(child)
     }
 
     override fun onDestroy(isRecreating: Boolean) {
@@ -40,7 +40,7 @@ open class RxWorkflowNode<V : RibView>(
      *
      * @return the current workflow element
      */
-    protected inline fun <reified T> executeWorkflow(
+    protected inline fun <reified T : Any> executeWorkflow(
         crossinline action: () -> Unit
     ): Single<T> = Single.fromCallable {
         action()
@@ -49,7 +49,7 @@ open class RxWorkflowNode<V : RibView>(
         .takeUntil(detachSignal.firstOrError())
 
     @VisibleForTesting
-    internal inline fun <reified T> executeWorkflowInternal(
+    internal inline fun <reified T : Any> executeWorkflowInternal(
         crossinline action: () -> Unit
     ): Single<T> = executeWorkflow(action)
 
@@ -61,19 +61,19 @@ open class RxWorkflowNode<V : RibView>(
      * @return the child as the expected workflow element, or error if expected child was not found
      */
     @SuppressWarnings("LongMethod")
-    protected inline fun <reified T> attachWorkflow(
+    protected inline fun <reified T : Any> attachWorkflow(
         crossinline action: () -> Unit
     ): Single<T> = Single.fromCallable {
         action()
         val childNodesOfExpectedType = children.filterIsInstance<T>()
         if (childNodesOfExpectedType.isEmpty()) {
-            Single.error<T>(
+            Single.error(
                 IllegalStateException(
                     "Expected child of type [${T::class.java}] was not found after executing action. " +
-                        "Check that your action actually results in the expected child. " +
-                        "Child count: ${children.size}. " +
-                        "Last child is: [${children.lastOrNull()}]. " +
-                        "All children: $children"
+                            "Check that your action actually results in the expected child. " +
+                            "Child count: ${children.size}. " +
+                            "Last child is: [${children.lastOrNull()}]. " +
+                            "All children: $children"
                 )
             )
         } else {
@@ -84,7 +84,7 @@ open class RxWorkflowNode<V : RibView>(
         .takeUntil(detachSignal.firstOrError())
 
     @VisibleForTesting
-    internal inline fun <reified T> attachWorkflowInternal(
+    internal inline fun <reified T : Any> attachWorkflowInternal(
         crossinline action: () -> Unit
     ): Single<T> = attachWorkflow(action)
 
@@ -94,11 +94,11 @@ open class RxWorkflowNode<V : RibView>(
      *
      * @return the child as the expected workflow element
      */
-    protected inline fun <reified T> waitForChildAttached(): Single<T> =
+    protected inline fun <reified T : Any> waitForChildAttached(): Single<T> =
         Single.fromCallable {
             val childNodesOfExpectedType = children.filterIsInstance<T>()
             if (childNodesOfExpectedType.isEmpty()) {
-                childrenAttaches?.ofType(T::class.java)?.firstOrError()
+                childrenAttaches.ofType(T::class.java).firstOrError()
             } else {
                 Single.just(childNodesOfExpectedType.last())
             }
@@ -107,6 +107,6 @@ open class RxWorkflowNode<V : RibView>(
             .takeUntil(detachSignal.firstOrError())
 
     @VisibleForTesting
-    internal inline fun <reified T> waitForChildAttachedInternal(): Single<T> =
+    internal inline fun <reified T : Any> waitForChildAttachedInternal(): Single<T> =
         waitForChildAttached()
 }
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/DisposablePluginTest.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/DisposablePluginTest.kt
similarity index 91%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/DisposablePluginTest.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/DisposablePluginTest.kt
index c5baa698b..c75f5c37c 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/DisposablePluginTest.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/DisposablePluginTest.kt
@@ -1,13 +1,13 @@
-package com.badoo.ribs.rx2
+package com.badoo.ribs.rx3
 
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.core.modality.BuildParams
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.disposables.Disposable
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class DisposablePluginTest {
 
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2ConnectableNodeTest.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3ConnectableNodeTest.kt
similarity index 70%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2ConnectableNodeTest.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3ConnectableNodeTest.kt
index 1a7f85122..bc1254443 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2ConnectableNodeTest.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3ConnectableNodeTest.kt
@@ -1,25 +1,24 @@
-package com.badoo.ribs.rx2.clienthelper.conector
+package com.badoo.ribs.rx3.clienthelper.conector
 
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.plugin.SubtreeChangeAware
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestNode
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output.Output1
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output.Output2
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestNode
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output.Output1
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output.Output2
 import com.badoo.ribs.test.BaseConnectableNodeTest
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
+class Rx3ConnectableNodeTest : BaseConnectableNodeTest() {
 
-class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
-
-    private lateinit var parent: Rx2ConnectableTestNode
+    private lateinit var parent: Rx3ConnectableTestNode
     private val testObserver = TestObserver<Output>()
     private val changesAwarePlugin = object : SubtreeChangeAware {
         override fun onChildAttached(child: Node<*>) {
-            (child as Rx2ConnectableTestNode).output.subscribe {
+            (child as Rx3ConnectableTestNode).output.subscribe {
                 testObserver.onNext(it)
             }
         }
@@ -27,7 +26,7 @@ class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
 
     @BeforeEach
     fun setUp() {
-        parent = Rx2ConnectableTestNode(plugins = listOf(changesAwarePlugin))
+        parent = Rx3ConnectableTestNode(plugins = listOf(changesAwarePlugin))
     }
 
     @AfterEach
@@ -37,7 +36,7 @@ class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
 
     @Test
     override fun `WHEN_child_emit_some_output_before_it_is_attached_to_parent_THEN_parent_receive_the_output_after_child_attach_finished`() {
-        val children = Rx2ConnectableTestNode(parent = parent)
+        val children = Rx3ConnectableTestNode(parent = parent)
 
         children.output.accept(Output1)
         parent.attachChildNode(children)
@@ -47,7 +46,7 @@ class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
 
     @Test
     override fun `WHEN_child_is_attached_and_emit_some_output_THEN_parent_receive_the_exact_output`() {
-        val children = Rx2ConnectableTestNode(parent = parent)
+        val children = Rx3ConnectableTestNode(parent = parent)
 
         parent.attachChildNode(children)
         children.output.accept(Output1)
@@ -58,7 +57,7 @@ class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
 
     @Test
     override fun `WHEN_child_emit_multiple_outputs_before_it_is_attached_to_parent_THEN_parent_receive_the_output_after_attach_finished_in_correct_order`() {
-        val children = Rx2ConnectableTestNode(parent = parent)
+        val children = Rx3ConnectableTestNode(parent = parent)
 
         children.output.accept(Output1)
         children.output.accept(Output2)
@@ -69,7 +68,7 @@ class Rx2ConnectableNodeTest : BaseConnectableNodeTest() {
 
     @Test
     override fun `WHEN_child_emit_output_before_it_is_attached_to_parent_and_then_after_it_is_attached_to_parent_THEN_parent_receive_the_output_in_correct_order`() {
-        val children = Rx2ConnectableTestNode(parent = parent)
+        val children = Rx3ConnectableTestNode(parent = parent)
 
         children.output.accept(Output1)
         parent.attachChildNode(children)
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2NodeConnectorTest.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3NodeConnectorTest.kt
similarity index 94%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2NodeConnectorTest.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3NodeConnectorTest.kt
index 1310ec200..18ee03a02 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/Rx2NodeConnectorTest.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/Rx3NodeConnectorTest.kt
@@ -1,13 +1,13 @@
-package com.badoo.ribs.rx2.clienthelper.conector
-
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Input
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output.Output1
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output.Output2
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output.Output3
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
+package com.badoo.ribs.rx3.clienthelper.conector
+
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Input
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output.Output1
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output.Output2
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output.Output3
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 import com.badoo.ribs.test.BaseNodeConnectorTest
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.RepeatedTest
@@ -17,7 +17,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-class Rx2NodeConnectorTest : BaseNodeConnectorTest() {
+class Rx3NodeConnectorTest : BaseNodeConnectorTest() {
 
     private val firstTestObserver = TestObserver<Output>()
     private val secondTestObserver = TestObserver<Output>()
diff --git a/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/AnyConfiguration.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/AnyConfiguration.kt
new file mode 100644
index 000000000..53b6580d4
--- /dev/null
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/AnyConfiguration.kt
@@ -0,0 +1,9 @@
+package com.badoo.ribs.rx3.clienthelper.conector.helpers
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+object AnyConfiguration : Parcelable {
+    override fun toString(): String = "AnyConfiguration"
+}
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestNode.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestNode.kt
similarity index 69%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestNode.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestNode.kt
index 5eab1ca90..c76c9bc7b 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/Rx2ConnectableTestNode.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestNode.kt
@@ -1,16 +1,16 @@
-package com.badoo.ribs.rx2.clienthelper.conector.helpers
+package com.badoo.ribs.rx3.clienthelper.conector.helpers
 
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.routing.Routing
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Input
-import com.badoo.ribs.rx2.clienthelper.conector.helpers.Rx2ConnectableTestRib.Output
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Input
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
-class Rx2ConnectableTestNode(
+class Rx3ConnectableTestNode(
     buildParams: BuildParams<*>? = null,
     parent: Node<*>? = null,
     plugins: List<Plugin> = emptyList(),
@@ -19,7 +19,7 @@ class Rx2ConnectableTestNode(
     buildParams = buildParams ?: getDefaultBuildParams(parent),
     viewFactory = null,
     plugins = plugins
-), Rx2ConnectableTestRib, Connectable<Input, Output> by connector {
+), Rx3ConnectableTestRib, Connectable<Input, Output> by connector {
 
     companion object {
         private fun getDefaultBuildParams(parent: Node<*>?): BuildParams<*> {
diff --git a/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestRib.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestRib.kt
new file mode 100644
index 000000000..849dd0077
--- /dev/null
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/Rx3ConnectableTestRib.kt
@@ -0,0 +1,16 @@
+package com.badoo.ribs.rx3.clienthelper.conector.helpers
+
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Input
+import com.badoo.ribs.rx3.clienthelper.conector.helpers.Rx3ConnectableTestRib.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+
+interface Rx3ConnectableTestRib : Connectable<Input, Output> {
+
+    sealed class Input
+
+    sealed class Output {
+        data object Output1 : Output()
+        data object Output2 : Output()
+        data object Output3 : Output()
+    }
+}
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/TestBuildParams.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/TestBuildParams.kt
similarity index 88%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/TestBuildParams.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/TestBuildParams.kt
index 7df761303..19cd9e2e6 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/clienthelper/conector/helpers/TestBuildParams.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/clienthelper/conector/helpers/TestBuildParams.kt
@@ -1,4 +1,4 @@
-package com.badoo.ribs.rx2.clienthelper.conector.helpers
+package com.badoo.ribs.rx3.clienthelper.conector.helpers
 
 import android.os.Bundle
 import com.badoo.ribs.core.Rib
@@ -7,7 +7,7 @@ import com.badoo.ribs.core.modality.ActivationMode
 import com.badoo.ribs.core.modality.AncestryInfo
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.core.modality.BuildParams
-import java.util.*
+import java.util.UUID
 
 fun testBuildParams(
     savedInstanceState: Bundle? = null,
@@ -15,7 +15,7 @@ fun testBuildParams(
     identifier: Rib.Identifier = Rib.Identifier(
         uuid = UUID.randomUUID()
     )
-) = BuildParams<Nothing?>(
+) = BuildParams(
     payload = null,
     buildContext = if (ancestryInfo == null) {
         BuildContext.root(savedInstanceState)
@@ -25,6 +25,7 @@ fun testBuildParams(
             activationMode = ActivationMode.ATTACH_TO_PARENT,
             savedInstanceState = savedInstanceState,
             customisations = RibCustomisationDirectoryImpl()
-    )},
+        )
+    },
     identifier = identifier
 )
diff --git a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/workflows/WorkflowTest.kt b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/workflows/WorkflowTest.kt
similarity index 94%
rename from libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/workflows/WorkflowTest.kt
rename to libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/workflows/WorkflowTest.kt
index 4ce925ee7..b31c2cf61 100644
--- a/libraries/rib-rx2/src/test/java/com/badoo/ribs/rx2/workflows/WorkflowTest.kt
+++ b/libraries/rib-rx3/src/test/java/com/badoo/ribs/rx3/workflows/WorkflowTest.kt
@@ -1,4 +1,4 @@
-package com.badoo.ribs.rx2.workflows
+package com.badoo.ribs.rx3.workflows
 
 import android.os.Parcelable
 import android.view.ViewGroup
@@ -14,16 +14,16 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.routing.Routing
 import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.util.RIBs
-import org.mockito.kotlin.argThat
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import io.reactivex.Single
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.observers.TestObserver
 import kotlinx.parcelize.Parcelize
 import org.junit.Assert
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 
 class WorkflowTest {
     private lateinit var node: RxWorkflowNode<TestView>
@@ -112,7 +112,8 @@ class WorkflowTest {
         workflow.subscribe(testObserver)
 
         Assert.assertEquals(false, actionInvoked)
-        testObserver.assertNever(node)
+        val values = testObserver.values()
+        Assert.assertFalse(values.contains(node))
         testObserver.assertNotComplete()
     }
 
@@ -140,9 +141,10 @@ class WorkflowTest {
         workflow.subscribe(testObserver)
 
         Assert.assertEquals(false, actionInvoked)
-        testObserver.assertNever(child1)
-        testObserver.assertNever(child2)
-        testObserver.assertNever(child3)
+        val values = testObserver.values()
+        Assert.assertFalse(values.contains(child1))
+        Assert.assertFalse(values.contains(child2))
+        Assert.assertFalse(values.contains(child3))
         testObserver.assertNotComplete()
     }
 
diff --git a/libraries/rib-rx2/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/libraries/rib-rx3/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from libraries/rib-rx2/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to libraries/rib-rx3/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/samples/app/customisations-demo/src/main/java/com/badoo/ribs/samples/customisations/app/CustomisationsActivity.kt b/samples/app/customisations-demo/src/main/java/com/badoo/ribs/samples/customisations/app/CustomisationsActivity.kt
index 319ea5f79..443105714 100644
--- a/samples/app/customisations-demo/src/main/java/com/badoo/ribs/samples/customisations/app/CustomisationsActivity.kt
+++ b/samples/app/customisations-demo/src/main/java/com/badoo/ribs/samples/customisations/app/CustomisationsActivity.kt
@@ -21,8 +21,10 @@ class CustomisationsActivity : RibActivity() {
     override fun createRib(savedInstanceState: Bundle?): Rib =
         SimpleRoutingParentBuilder(
             object : SimpleRoutingParent.Dependency {}
-        ).build(BuildContext.root(
-            savedInstanceState = savedInstanceState,
-            customisations = AppCustomisations
-        ))
+        ).build(
+            BuildContext.root(
+                savedInstanceState = savedInstanceState,
+                customisations = AppCustomisations
+            )
+        )
 }
diff --git a/samples/app/gallery/build.gradle b/samples/app/gallery/build.gradle
index 8a4cb1eee..c08fa0614 100644
--- a/samples/app/gallery/build.gradle
+++ b/samples/app/gallery/build.gradle
@@ -38,8 +38,8 @@ dependencies {
     implementation deps.external.dagger
     implementation deps.external.mviCore
     implementation deps.external.mviCoreAndroid
-    implementation deps.external.rxrelay2
-    implementation deps.external.rxandroid2
+    implementation deps.external.rxrelay3
+    implementation deps.external.rxandroid3
     implementation deps.external.leakCanary // use debugImplementation in real life apps
 
     implementation deps.android.appCompat
@@ -58,7 +58,7 @@ dependencies {
     implementation project(":libraries:rib-compose")
     implementation project(':libraries:rib-debug-utils')
     implementation project(':libraries:rib-mvicore')
-    implementation project(':libraries:rib-rx2')
+    implementation project(':libraries:rib-rx3')
 
     implementation project(':samples:elements:routing:back-stack')
     implementation project(':samples:elements:routing:parameterised-routing')
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/RootActivity.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/RootActivity.kt
index df604051a..4e81eb765 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/RootActivity.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/RootActivity.kt
@@ -19,8 +19,7 @@ import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer
 import com.badoo.ribs.samples.gallery.rib.root.container.RootContainerBuilder
 import leakcanary.AppWatcher
 
-class RootActivity : RibActivity()
-{
+class RootActivity : RibActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         setContentView(R.layout.activity_root)
         super.onCreate(savedInstanceState)
@@ -41,7 +40,8 @@ class RootActivity : RibActivity()
                 override val dialogLauncher: DialogLauncher
                     get() = integrationPoint.dialogLauncher
             }
-        ).build(root(
+        ).build(
+            root(
             savedInstanceState = savedInstanceState,
             defaultPlugins = { node ->
                 if (BuildConfig.DEBUG) {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainer.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainer.kt
index 58019b867..9a7f4aaea 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainer.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainer.kt
@@ -6,7 +6,7 @@ import com.badoo.ribs.android.permissionrequester.CanProvidePermissionRequester
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.android.container.AndroidContainer.Input
 import com.badoo.ribs.samples.gallery.rib.android.container.AndroidContainer.Output
 import com.badoo.ribs.samples.gallery.rib.android.container.routing.AndroidContainerRouter
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerBuilder.kt
index 457da88bd..079213ecf 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerBuilder.kt
@@ -44,11 +44,11 @@ class AndroidContainerBuilder(
         builders: AndroidContainerChildBuilders,
         customisation: AndroidContainer.Customisation
     ) = AndroidContainerRouter(
-            buildParams = buildParams,
-            builders = builders,
-            routingSource = routingSource,
-            transitionHandler = customisation.transitionHandler
-        )
+        buildParams = buildParams,
+        builders = builders,
+        routingSource = routingSource,
+        transitionHandler = customisation.transitionHandler
+    )
 
     private fun node(
         buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerInteractor.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerInteractor.kt
index 432c81c4e..297e5a56a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerInteractor.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerInteractor.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.samples.gallery.rib.android.container.routing.AndroidContainerRouter.Configuration
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class AndroidContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerNode.kt
index a4a23ba3e..12fdf7354 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/AndroidContainerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.android.container
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.android.container.AndroidContainer.Input
 import com.badoo.ribs.samples.gallery.rib.android.container.AndroidContainer.Output
 
@@ -18,6 +18,4 @@ class AndroidContainerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), AndroidContainer, Connectable<Input, Output> by connector {
-
-}
+), AndroidContainer, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerChildBuilders.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerChildBuilders.kt
index 1acf8f873..801db5474 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerChildBuilders.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerChildBuilders.kt
@@ -1,14 +1,14 @@
 package com.badoo.ribs.samples.gallery.rib.android.container.routing
 
+import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExample
+import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExampleBuilder
 import com.badoo.ribs.samples.android.launching_activities.rib.launching_activities_example.LaunchingActivitiesExample
 import com.badoo.ribs.samples.android.launching_activities.rib.launching_activities_example.LaunchingActivitiesExampleBuilder
-import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExampleBuilder
-import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExample
+import com.badoo.ribs.samples.android.permissions.rib.parent.PermissionsExample
+import com.badoo.ribs.samples.android.permissions.rib.parent.PermissionsExampleBuilder
 import com.badoo.ribs.samples.gallery.rib.android.container.AndroidContainer
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPickerBuilder
-import com.badoo.ribs.samples.android.permissions.rib.parent.PermissionsExample
-import com.badoo.ribs.samples.android.permissions.rib.parent.PermissionsExampleBuilder
 
 internal class AndroidContainerChildBuilders(
     dependency: AndroidContainer.Dependency
@@ -26,8 +26,7 @@ internal class AndroidContainerChildBuilders(
         AndroidPicker.Dependency,
         LaunchingActivitiesExample.Dependency,
         PermissionsExample.Dependency,
-        DialogsExample.Dependency {
-    }
+        DialogsExample.Dependency
 }
 
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerRouter.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerRouter.kt
index ea9b24011..41fa09084 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerRouter.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/container/routing/AndroidContainerRouter.kt
@@ -16,16 +16,20 @@ class AndroidContainerRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: AndroidContainerChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Picker : Configuration()
-        @Parcelize object AcitivityExample : Configuration()
-        @Parcelize object PermissionsExample : Configuration()
-        @Parcelize object DialogExample : Configuration()
+        @Parcelize
+        data object Picker : Configuration()
+        @Parcelize
+        data object AcitivityExample : Configuration()
+        @Parcelize
+        data object PermissionsExample : Configuration()
+        @Parcelize
+        data object DialogExample : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPicker.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPicker.kt
index c01c7b5ee..d40153a39 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPicker.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPicker.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.samples.gallery.rib.android.picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker.Input
@@ -13,9 +13,9 @@ interface AndroidPicker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object ActivitiesExampleSelected : Output()
-        object PermissionsExampleSelected : Output()
-        object DialogsExampleSelected : Output()
+        data object ActivitiesExampleSelected : Output()
+        data object PermissionsExampleSelected : Output()
+        data object DialogsExampleSelected : Output()
     }
 
     class Customisation(
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerBuilder.kt
index 06a1e1112..1d44e7ffd 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerBuilder.kt
@@ -17,18 +17,18 @@ class AndroidPickerBuilder(
     private fun interactor(
         buildParams: BuildParams<*>,
     ) = AndroidPickerInteractor(
-            buildParams = buildParams,
-        )
+        buildParams = buildParams,
+    )
 
     private fun node(
         buildParams: BuildParams<Nothing?>,
         customisation: AndroidPicker.Customisation,
         interactor: AndroidPickerInteractor
     ) = AndroidPickerNode(
-            buildParams = buildParams,
-            viewFactory = customisation.viewFactory(null),
-            plugins = listOf(
-                interactor
-            )
+        buildParams = buildParams,
+        viewFactory = customisation.viewFactory(null),
+        plugins = listOf(
+            interactor
         )
+    )
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerNode.kt
index c4354231e..7745e5ef0 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.android.picker
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker.Input
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker.Output
 
@@ -18,6 +18,4 @@ class AndroidPickerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), AndroidPicker, Connectable<Input, Output> by connector {
-
-}
+), AndroidPicker, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerView.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerView.kt
index 8cbb218ca..829c9b51a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerView.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/AndroidPickerView.kt
@@ -10,16 +10,16 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.gallery.composable.ButtonList
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPickerView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface AndroidPickerView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object LaunchingActivitiesClicked : Event()
-        object PermissionsClicked : Event()
-        object DialogsClicked : Event()
+        data object LaunchingActivitiesClicked : Event()
+        data object PermissionsClicked : Event()
+        data object DialogsClicked : Event()
     }
 
     fun interface Factory : ViewFactoryBuilder<Nothing?, AndroidPickerView>
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/mapper/ViewEventToOutput.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/mapper/ViewEventToOutput.kt
index 0f989ddfe..412a38323 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/mapper/ViewEventToOutput.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/android/picker/mapper/ViewEventToOutput.kt
@@ -6,7 +6,7 @@ import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker.Output.Di
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPicker.Output.PermissionsExampleSelected
 import com.badoo.ribs.samples.gallery.rib.android.picker.AndroidPickerView.Event
 
-internal object ViewEventToOutput : (Event) -> AndroidPicker.Output? {
+internal object ViewEventToOutput : (Event) -> AndroidPicker.Output {
 
     override fun invoke(event: Event): AndroidPicker.Output =
         when (event) {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainer.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainer.kt
index f89d6af37..ab27826b1 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainer.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainer.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.samples.gallery.rib.communication.container
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationContainer.Input
 import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationContainer.Output
 import com.badoo.ribs.samples.gallery.rib.communication.container.routing.CommunicationContainerRouter
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerBuilder.kt
index 4bfef1fef..5e563cd8a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerBuilder.kt
@@ -44,11 +44,11 @@ class CommunicationContainerBuilder(
         builders: CommunicationContainerChildBuilders,
         customisation: CommunicationContainer.Customisation
     ) = CommunicationContainerRouter(
-            buildParams = buildParams,
-            builders = builders,
-            routingSource = routingSource,
-            transitionHandler = customisation.transitionHandler
-        )
+        buildParams = buildParams,
+        builders = builders,
+        routingSource = routingSource,
+        transitionHandler = customisation.transitionHandler
+    )
 
     private fun node(
         buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerInteractor.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerInteractor.kt
index f192643a5..797e855cb 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerInteractor.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerInteractor.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.samples.gallery.rib.communication.container.routing.CommunicationContainerRouter.Configuration
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class CommunicationContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerNode.kt
index e29939b3a..8caa5ec20 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/CommunicationContainerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.communication.container
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationContainer.Input
 import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationContainer.Output
 
@@ -18,6 +18,4 @@ class CommunicationContainerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), CommunicationContainer, Connectable<Input, Output> by connector {
-
-}
+), CommunicationContainer, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerChildBuilders.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerChildBuilders.kt
index f99832209..90a0002b5 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerChildBuilders.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerChildBuilders.kt
@@ -22,8 +22,7 @@ internal class CommunicationContainerChildBuilders(
     ) : CommunicationContainer.Dependency by dependency,
         CommunicationPicker.Dependency,
         GreetingContainer.Dependency,
-        MenuExample.Dependency {
-    }
+        MenuExample.Dependency
 }
 
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerRouter.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerRouter.kt
index 386e3ebfa..035a198a8 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerRouter.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/container/routing/CommunicationContainerRouter.kt
@@ -16,15 +16,20 @@ class CommunicationContainerRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: CommunicationContainerChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Picker : Configuration()
-        @Parcelize object MenuExample : Configuration()
-        @Parcelize object CoordinateMultipleExample : Configuration()
+        @Parcelize
+        data object Picker : Configuration()
+
+        @Parcelize
+        data object MenuExample : Configuration()
+
+        @Parcelize
+        data object CoordinateMultipleExample : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPicker.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPicker.kt
index 880b057bb..622d47262 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPicker.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPicker.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.samples.gallery.rib.communication.picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Input
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Output
 
@@ -13,8 +13,8 @@ interface CommunicationPicker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object MenuExampleSelected : Output()
-        object CoordinateMultipleSelected : Output()
+        data object MenuExampleSelected : Output()
+        data object CoordinateMultipleSelected : Output()
     }
 
     class Customisation(
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerBuilder.kt
index e9bc44c3a..61eae0e0a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerBuilder.kt
@@ -17,18 +17,18 @@ class CommunicationPickerBuilder(
     private fun interactor(
         buildParams: BuildParams<*>,
     ) = CommunicationPickerInteractor(
-            buildParams = buildParams,
-        )
+        buildParams = buildParams,
+    )
 
     private fun node(
         buildParams: BuildParams<Nothing?>,
         customisation: CommunicationPicker.Customisation,
         interactor: CommunicationPickerInteractor
     ) = CommunicationPickerNode(
-            buildParams = buildParams,
-            viewFactory = customisation.viewFactory(null),
-            plugins = listOf(
-                interactor
-            )
+        buildParams = buildParams,
+        viewFactory = customisation.viewFactory(null),
+        plugins = listOf(
+            interactor
         )
+    )
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerNode.kt
index 613d9e951..cf6300126 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.communication.picker
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Input
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Output
 
@@ -18,6 +18,4 @@ class CommunicationPickerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), CommunicationPicker, Connectable<Input, Output> by connector {
-
-}
+), CommunicationPicker, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerView.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerView.kt
index 44799e057..5549a22e5 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerView.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/CommunicationPickerView.kt
@@ -10,15 +10,15 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.gallery.composable.ButtonList
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPickerView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface CommunicationPickerView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object MenuExampleClicked : Event()
-        object CoordinateMultipleExampleClicked : Event()
+        data object MenuExampleClicked : Event()
+        data object CoordinateMultipleExampleClicked : Event()
     }
 
     fun interface Factory : ViewFactoryBuilder<Nothing?, CommunicationPickerView>
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/mapper/ViewEventToOutput.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/mapper/ViewEventToOutput.kt
index 4342caaa4..de1844842 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/mapper/ViewEventToOutput.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/communication/picker/mapper/ViewEventToOutput.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.samples.gallery.rib.communication.picker.mapper
 
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker
-import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Output.MenuExampleSelected
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Output.CoordinateMultipleSelected
+import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPicker.Output.MenuExampleSelected
 import com.badoo.ribs.samples.gallery.rib.communication.picker.CommunicationPickerView.Event
 
-internal object ViewEventToOutput : (Event) -> CommunicationPicker.Output? {
+internal object ViewEventToOutput : (Event) -> CommunicationPicker.Output {
 
     override fun invoke(event: Event): CommunicationPicker.Output =
         when (event) {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainer.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainer.kt
index ce44902fc..c2dee353b 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainer.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainer.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.samples.gallery.rib.other.container
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainer.Input
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainer.Output
 import com.badoo.ribs.samples.gallery.rib.other.container.routing.OtherContainerRouter
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerBuilder.kt
index d2b630aad..577ea6be3 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerBuilder.kt
@@ -44,11 +44,11 @@ class OtherContainerBuilder(
         builders: OtherContainerChildBuilders,
         customisation: OtherContainer.Customisation
     ) = OtherContainerRouter(
-            buildParams = buildParams,
-            builders = builders,
-            routingSource = routingSource,
-            transitionHandler = customisation.transitionHandler
-        )
+        buildParams = buildParams,
+        builders = builders,
+        routingSource = routingSource,
+        transitionHandler = customisation.transitionHandler
+    )
 
     private fun node(
         buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerInteractor.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerInteractor.kt
index 1c8e83965..540ae1b9c 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerInteractor.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerInteractor.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.samples.gallery.rib.other.container.routing.OtherContainerRouter.Configuration
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class OtherContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerNode.kt
index b777d8dd9..58e8c0c9e 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/OtherContainerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.other.container
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainer.Input
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainer.Output
 
@@ -18,6 +18,4 @@ class OtherContainerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), OtherContainer, Connectable<Input, Output> by connector {
-
-}
+), OtherContainer, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerChildBuilders.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerChildBuilders.kt
index 1598f7c11..66fecd154 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerChildBuilders.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerChildBuilders.kt
@@ -18,8 +18,7 @@ internal class OtherContainerChildBuilders(
         dependency: OtherContainer.Dependency
     ) : OtherContainer.Dependency by dependency,
         OtherPicker.Dependency,
-        RetainedInstanceExample.Dependency {
-    }
+        RetainedInstanceExample.Dependency
 }
 
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerRouter.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerRouter.kt
index b862cabae..bf8cde1cf 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerRouter.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/container/routing/OtherContainerRouter.kt
@@ -16,21 +16,27 @@ class OtherContainerRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: OtherContainerChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Picker : Configuration()
-        @Parcelize object RetainedInstanceStoreExample : Configuration()
+        @Parcelize
+        data object Picker : Configuration()
+        @Parcelize
+        data object RetainedInstanceStoreExample : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
         with(builders) {
             when (routing.configuration) {
                 Configuration.Picker -> child { picker.build(it) }
-                Configuration.RetainedInstanceStoreExample -> child { retainedInstanceExample.build(it) }
+                Configuration.RetainedInstanceStoreExample -> child {
+                    retainedInstanceExample.build(
+                        it
+                    )
+                }
             }
         }
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPicker.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPicker.kt
index fcacb95a3..40305f873 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPicker.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPicker.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.samples.gallery.rib.other.picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker.Input
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker.Output
 
@@ -13,7 +13,7 @@ interface OtherPicker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object RetainedInstanceStoreSelected : Output()
+        data object RetainedInstanceStoreSelected : Output()
     }
 
     class Customisation(
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerBuilder.kt
index 517be2873..e673c184a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerBuilder.kt
@@ -17,18 +17,18 @@ class OtherPickerBuilder(
     private fun interactor(
         buildParams: BuildParams<*>,
     ) = OtherPickerInteractor(
-            buildParams = buildParams,
-        )
+        buildParams = buildParams,
+    )
 
     private fun node(
         buildParams: BuildParams<Nothing?>,
         customisation: OtherPicker.Customisation,
         interactor: OtherPickerInteractor
     ) = OtherPickerNode(
-            buildParams = buildParams,
-            viewFactory = customisation.viewFactory(null),
-            plugins = listOf(
-                interactor
-            )
+        buildParams = buildParams,
+        viewFactory = customisation.viewFactory(null),
+        plugins = listOf(
+            interactor
         )
+    )
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerNode.kt
index 2c39b3e8c..da3253b18 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.other.picker
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker.Input
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker.Output
 
@@ -18,6 +18,4 @@ class OtherPickerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), OtherPicker, Connectable<Input, Output> by connector {
-
-}
+), OtherPicker, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerView.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerView.kt
index 3d80f5e71..2ee2d9eba 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerView.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/OtherPickerView.kt
@@ -10,14 +10,14 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.gallery.composable.ButtonList
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPickerView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface OtherPickerView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object RetainedInstanceStoreClicked : Event()
+        data object RetainedInstanceStoreClicked : Event()
     }
 
     fun interface Factory : ViewFactoryBuilder<Nothing?, OtherPickerView>
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/mapper/ViewEventToOutput.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/mapper/ViewEventToOutput.kt
index ab7f6b5d0..6e1d9dbad 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/mapper/ViewEventToOutput.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/other/picker/mapper/ViewEventToOutput.kt
@@ -4,7 +4,7 @@ import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPicker.Output.RetainedInstanceStoreSelected
 import com.badoo.ribs.samples.gallery.rib.other.picker.OtherPickerView.Event
 
-internal object ViewEventToOutput : (Event) -> OtherPicker.Output? {
+internal object ViewEventToOutput : (Event) -> OtherPicker.Output {
 
     override fun invoke(event: Event): OtherPicker.Output =
         when (event) {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainer.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainer.kt
index ecbe3ff63..39ff3475c 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainer.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainer.kt
@@ -3,15 +3,15 @@ package com.badoo.ribs.samples.gallery.rib.root.container
 import com.badoo.ribs.android.activitystarter.CanProvideActivityStarter
 import com.badoo.ribs.android.dialog.CanProvideDialogLauncher
 import com.badoo.ribs.android.permissionrequester.CanProvidePermissionRequester
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
-import com.badoo.ribs.routing.transition.handler.TransitionHandler
 import com.badoo.ribs.core.customisation.RibCustomisation
-import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
+import com.badoo.ribs.routing.transition.handler.TransitionHandler
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer.Input
 import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer.Output
 import com.badoo.ribs.samples.gallery.rib.root.container.routing.RootContainerRouter
-import io.reactivex.Single
+import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
+import io.reactivex.rxjava3.core.Single
 
 interface RootContainer : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerBuilder.kt
index dca5f70e3..46fc6591f 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerBuilder.kt
@@ -44,11 +44,11 @@ class RootContainerBuilder(
         builders: RootContainerChildBuilders,
         customisation: RootContainer.Customisation
     ) = RootContainerRouter(
-            buildParams = buildParams,
-            builders = builders,
-            routingSource = routingSource,
-            transitionHandler = customisation.transitionHandler
-        )
+        buildParams = buildParams,
+        builders = builders,
+        routingSource = routingSource,
+        transitionHandler = customisation.transitionHandler
+    )
 
     private fun node(
         buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerInteractor.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerInteractor.kt
index b878db3ad..8b39c2a81 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerInteractor.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerInteractor.kt
@@ -1,15 +1,15 @@
 package com.badoo.ribs.samples.gallery.rib.root.container
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.ribs.clienthelper.childaware.childAware
 import com.badoo.mvicore.android.lifecycle.createDestroy
+import com.badoo.ribs.clienthelper.childaware.childAware
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
-import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
 import com.badoo.ribs.samples.gallery.rib.root.container.routing.RootContainerRouter.Configuration
-import io.reactivex.functions.Consumer
+import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class RootContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerNode.kt
index 987527a8b..255777033 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/RootContainerNode.kt
@@ -1,4 +1,5 @@
 @file:SuppressWarnings("LongParameterList")
+
 package com.badoo.ribs.samples.gallery.rib.root.container
 
 import com.badoo.ribs.core.modality.BuildParams
@@ -6,14 +7,14 @@ import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
-import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer.Input
 import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer.Output
 import com.badoo.ribs.samples.gallery.rib.root.container.routing.RootContainerRouter.Configuration
-import io.reactivex.Single
+import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
+import io.reactivex.rxjava3.core.Single
 
 class RootContainerNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/compose/Theme.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/compose/Theme.kt
index 86bf4dc3a..361126044 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/compose/Theme.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/compose/Theme.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
 @Composable
-fun GalleryTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) {
+fun GalleryTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
     val colors = if (darkTheme) {
         DarkColorPalette
     } else {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerChildBuilders.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerChildBuilders.kt
index df157f107..d4ea0f259 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerChildBuilders.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerChildBuilders.kt
@@ -6,9 +6,9 @@ import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationC
 import com.badoo.ribs.samples.gallery.rib.communication.container.CommunicationContainerBuilder
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainer
 import com.badoo.ribs.samples.gallery.rib.other.container.OtherContainerBuilder
+import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPickerBuilder
-import com.badoo.ribs.samples.gallery.rib.root.container.RootContainer
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainerBuilder
 
@@ -17,11 +17,11 @@ internal class RootContainerChildBuilders(
 ) {
     private val subtreeDeps = SubtreeDependency(dependency)
 
-     val picker = RootPickerBuilder(subtreeDeps)
-     val routingContainer = RoutingContainerBuilder(subtreeDeps)
-     val communicationContainer = CommunicationContainerBuilder(subtreeDeps)
-     val androidContainer = AndroidContainerBuilder(subtreeDeps)
-     val otherContainer = OtherContainerBuilder(subtreeDeps)
+    val picker = RootPickerBuilder(subtreeDeps)
+    val routingContainer = RoutingContainerBuilder(subtreeDeps)
+    val communicationContainer = CommunicationContainerBuilder(subtreeDeps)
+    val androidContainer = AndroidContainerBuilder(subtreeDeps)
+    val otherContainer = OtherContainerBuilder(subtreeDeps)
 
     class SubtreeDependency(
         dependency: RootContainer.Dependency
@@ -31,8 +31,6 @@ internal class RootContainerChildBuilders(
         CommunicationContainer.Dependency,
         AndroidContainer.Dependency,
         OtherContainer.Dependency
-    {
-    }
 }
 
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerRouter.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerRouter.kt
index e22859d61..5d6ebc645 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerRouter.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/container/routing/RootContainerRouter.kt
@@ -21,17 +21,22 @@ class RootContainerRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: RootContainerChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Picker : Configuration()
-        @Parcelize object RoutingExamples : Configuration()
-        @Parcelize object CommunicationExamples : Configuration()
-        @Parcelize object AndroidExamples : Configuration()
-        @Parcelize object OtherExamples : Configuration()
+        @Parcelize
+        data object Picker : Configuration()
+        @Parcelize
+        data object RoutingExamples : Configuration()
+        @Parcelize
+        data object CommunicationExamples : Configuration()
+        @Parcelize
+        data object AndroidExamples : Configuration()
+        @Parcelize
+        data object OtherExamples : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPicker.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPicker.kt
index 5527fc017..2df4fc66a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPicker.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPicker.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.samples.gallery.rib.root.picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Input
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Output
 
@@ -13,10 +13,10 @@ interface RootPicker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object AndroidSelected : Output()
-        object CommunicationSelected : Output()
-        object RoutingSelected : Output()
-        object OtherSelected : Output()
+        data object AndroidSelected : Output()
+        data object CommunicationSelected : Output()
+        data object RoutingSelected : Output()
+        data object OtherSelected : Output()
     }
 
     class Customisation(
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerBuilder.kt
index 34dc52aaf..b43203980 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerBuilder.kt
@@ -3,7 +3,6 @@ package com.badoo.ribs.samples.gallery.rib.root.picker
 import com.badoo.ribs.builder.SimpleBuilder
 import com.badoo.ribs.core.modality.BuildParams
 
-
 class RootPickerBuilder(
     private val dependency: RootPicker.Dependency
 ) : SimpleBuilder<RootPicker>() {
@@ -24,10 +23,10 @@ class RootPickerBuilder(
         customisation: RootPicker.Customisation,
         interactor: RootPickerInteractor
     ) = RootPickerNode(
-            buildParams = buildParams,
-            viewFactory = customisation.viewFactory(null),
-            plugins = listOf(
-                interactor
-            )
+        buildParams = buildParams,
+        viewFactory = customisation.viewFactory(null),
+        plugins = listOf(
+            interactor
         )
+    )
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerNode.kt
index c25a161ae..111aa4ce9 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerNode.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.samples.gallery.rib.root.picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Input
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Output
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
 
 class RootPickerNode internal constructor(
     buildParams: BuildParams<*>,
@@ -18,6 +18,4 @@ class RootPickerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), RootPicker, Connectable<Input, Output> by connector {
-
-}
+), RootPicker, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerView.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerView.kt
index 37ad41f7e..6d830b13e 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerView.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/RootPickerView.kt
@@ -10,17 +10,17 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.gallery.composable.ButtonList
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPickerView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface RootPickerView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object RoutingClicked : Event()
-        object CommunicationClicked : Event()
-        object AndroidClicked : Event()
-        object OtherClicked : Event()
+        data object RoutingClicked : Event()
+        data object CommunicationClicked : Event()
+        data object AndroidClicked : Event()
+        data object OtherClicked : Event()
     }
 
     fun interface Factory : ViewFactoryBuilder<Nothing?, RootPickerView>
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/mapper/ViewEventToOutput.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/mapper/ViewEventToOutput.kt
index 8bba77bb9..d6c8eb019 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/mapper/ViewEventToOutput.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/root/picker/mapper/ViewEventToOutput.kt
@@ -7,7 +7,7 @@ import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Output.OtherSel
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPicker.Output.RoutingSelected
 import com.badoo.ribs.samples.gallery.rib.root.picker.RootPickerView.Event
 
-internal object ViewEventToOutput : (Event) -> RootPicker.Output? {
+internal object ViewEventToOutput : (Event) -> RootPicker.Output {
 
     override fun invoke(event: Event): RootPicker.Output =
         when (event) {
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainer.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainer.kt
index 868df3830..056f2abe9 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainer.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainer.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.samples.gallery.rib.routing.routing_container
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer.Input
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer.Output
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.routing.RoutingContainerRouter
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerBuilder.kt
index beb37e73f..069ae5329 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerBuilder.kt
@@ -44,11 +44,11 @@ class RoutingContainerBuilder(
         builders: RoutingContainerChildBuilders,
         customisation: RoutingContainer.Customisation
     ) = RoutingContainerRouter(
-            buildParams = buildParams,
-            builders = builders,
-            routingSource = routingSource,
-            transitionHandler = customisation.transitionHandler
-        )
+        buildParams = buildParams,
+        builders = builders,
+        routingSource = routingSource,
+        transitionHandler = customisation.transitionHandler
+    )
 
     private fun node(
         buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerInteractor.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerInteractor.kt
index 573ade20d..3c75233e2 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerInteractor.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerInteractor.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.routing.RoutingContainerRouter.Configuration
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class RoutingContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerNode.kt
index e6ef2c614..36d91a5c2 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/RoutingContainerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.routing.routing_container
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer.Input
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer.Output
 
@@ -18,6 +18,4 @@ class RoutingContainerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), RoutingContainer, Connectable<Input, Output> by connector {
-
-}
+), RoutingContainer, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerChildBuilders.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerChildBuilders.kt
index 80d7a5d7e..56b164c91 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerChildBuilders.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerChildBuilders.kt
@@ -1,10 +1,10 @@
 package com.badoo.ribs.samples.gallery.rib.routing.routing_container.routing
 
-import com.badoo.ribs.samples.routing.back_stack.rib.back_stack_example.BackStackExample
-import com.badoo.ribs.samples.routing.back_stack.rib.back_stack_example.BackStackExampleBuilder
 import com.badoo.ribs.samples.gallery.rib.routing.routing_container.RoutingContainer
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPickerBuilder
+import com.badoo.ribs.samples.routing.back_stack.rib.back_stack_example.BackStackExample
+import com.badoo.ribs.samples.routing.back_stack.rib.back_stack_example.BackStackExampleBuilder
 import com.badoo.ribs.samples.routing.parameterised_routing.rib.parameterised_routing_example.ParameterisedRoutingExample
 import com.badoo.ribs.samples.routing.parameterised_routing.rib.parameterised_routing_example.ParameterisedRoutingExampleBuilder
 import com.badoo.ribs.samples.routing.simple_routing.rib.simple_routing_parent.SimpleRoutingParent
@@ -30,8 +30,7 @@ internal class RoutingContainerChildBuilders(
         SimpleRoutingParent.Dependency,
         BackStackExample.Dependency,
         ParameterisedRoutingExample.Dependency,
-        TransitionAnimationsExample.Dependency {
-    }
+        TransitionAnimationsExample.Dependency
 }
 
 
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerRouter.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerRouter.kt
index 12ada1caf..dba024e3a 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerRouter.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_container/routing/RoutingContainerRouter.kt
@@ -16,17 +16,22 @@ class RoutingContainerRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: RoutingContainerChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Picker : Configuration()
-        @Parcelize object SimpleRoutingExample : Configuration()
-        @Parcelize object BackStackExample : Configuration()
-        @Parcelize object ParameterisedExample : Configuration()
-        @Parcelize object TransitionsExample : Configuration()
+        @Parcelize
+        data object Picker : Configuration()
+        @Parcelize
+        data object SimpleRoutingExample : Configuration()
+        @Parcelize
+        data object BackStackExample : Configuration()
+        @Parcelize
+        data object ParameterisedExample : Configuration()
+        @Parcelize
+        data object TransitionsExample : Configuration()
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPicker.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPicker.kt
index 23edc090b..5c47132b6 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPicker.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPicker.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.samples.gallery.rib.routing.routing_picker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker.Input
@@ -13,10 +13,10 @@ interface RoutingPicker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object SimpleRoutingSelected : Output()
-        object BackStackSelected : Output()
-        object ParameterisedRoutingSelected : Output()
-        object TransitionsSelected : Output()
+        data object SimpleRoutingSelected : Output()
+        data object BackStackSelected : Output()
+        data object ParameterisedRoutingSelected : Output()
+        data object TransitionsSelected : Output()
     }
 
     class Customisation(
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerBuilder.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerBuilder.kt
index 9ea2767d6..681449ca2 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerBuilder.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerBuilder.kt
@@ -17,18 +17,18 @@ class RoutingPickerBuilder(
     private fun interactor(
         buildParams: BuildParams<*>,
     ) = RoutingPickerInteractor(
-            buildParams = buildParams,
-        )
+        buildParams = buildParams,
+    )
 
     private fun node(
         buildParams: BuildParams<Nothing?>,
         customisation: RoutingPicker.Customisation,
         interactor: RoutingPickerInteractor
     ) = RoutingPickerNode(
-            buildParams = buildParams,
-            viewFactory = customisation.viewFactory(null),
-            plugins = listOf(
-                interactor
-            )
+        buildParams = buildParams,
+        viewFactory = customisation.viewFactory(null),
+        plugins = listOf(
+            interactor
         )
+    )
 }
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerNode.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerNode.kt
index f510eb497..e0a6cbec5 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerNode.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerNode.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.samples.gallery.rib.routing.routing_picker
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker.Input
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker.Output
 
@@ -18,6 +18,4 @@ class RoutingPickerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), RoutingPicker, Connectable<Input, Output> by connector {
-
-}
+), RoutingPicker, Connectable<Input, Output> by connector
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerView.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerView.kt
index 75f456541..56b973c0b 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerView.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/RoutingPickerView.kt
@@ -10,17 +10,17 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.gallery.composable.ButtonList
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPickerView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface RoutingPickerView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object SimpleRoutingClicked : Event()
-        object BackStackClicked : Event()
-        object ParameterisedRoutingClicked : Event()
-        object TransitionsClicked : Event()
+        data object SimpleRoutingClicked : Event()
+        data object BackStackClicked : Event()
+        data object ParameterisedRoutingClicked : Event()
+        data object TransitionsClicked : Event()
     }
 
     fun interface Factory : ViewFactoryBuilder<Nothing?, RoutingPickerView>
diff --git a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/mapper/ViewEventToOutput.kt b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/mapper/ViewEventToOutput.kt
index a7f8ca1b5..ea3f5465b 100644
--- a/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/mapper/ViewEventToOutput.kt
+++ b/samples/app/gallery/src/main/java/com/badoo/ribs/samples/gallery/rib/routing/routing_picker/mapper/ViewEventToOutput.kt
@@ -7,7 +7,7 @@ import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker.O
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPicker.Output.TransitionsSelected
 import com.badoo.ribs.samples.gallery.rib.routing.routing_picker.RoutingPickerView.Event
 
-internal object ViewEventToOutput : (Event) -> RoutingPicker.Output? {
+internal object ViewEventToOutput : (Event) -> RoutingPicker.Output {
 
     override fun invoke(event: Event): RoutingPicker.Output =
         when (event) {
diff --git a/samples/app/gallery/src/main/res/layout/activity_root.xml b/samples/app/gallery/src/main/res/layout/activity_root.xml
index eb5b08cb0..9aba5b9ed 100644
--- a/samples/app/gallery/src/main/res/layout/activity_root.xml
+++ b/samples/app/gallery/src/main/res/layout/activity_root.xml
@@ -21,7 +21,7 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true" >
+            android:fillViewport="true">
 
             <LinearLayout
                 android:id="@+id/debug_controls_host"
diff --git a/samples/app/gallery/src/main/res/layout/rib_communication_container.xml b/samples/app/gallery/src/main/res/layout/rib_communication_container.xml
index a20964a4e..358c71210 100644
--- a/samples/app/gallery/src/main/res/layout/rib_communication_container.xml
+++ b/samples/app/gallery/src/main/res/layout/rib_communication_container.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_communication_container"
     android:layout_width="match_parent"
@@ -10,9 +9,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Let's have a drink in the Foo Bar"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/app/gallery/src/main/res/layout/rib_communication_picker.xml b/samples/app/gallery/src/main/res/layout/rib_communication_picker.xml
index de1f01444..f21790e1e 100644
--- a/samples/app/gallery/src/main/res/layout/rib_communication_picker.xml
+++ b/samples/app/gallery/src/main/res/layout/rib_communication_picker.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_communication_picker"
     android:layout_width="match_parent"
@@ -10,9 +9,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Let's have a drink in the Foo Bar"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/app/hello-world/src/androidTest/java/com/badoo/ribs/samples/helloworld/HelloWorldTest.kt b/samples/app/hello-world/src/androidTest/java/com/badoo/ribs/samples/helloworld/HelloWorldTest.kt
index 8092592cc..62c10326b 100644
--- a/samples/app/hello-world/src/androidTest/java/com/badoo/ribs/samples/helloworld/HelloWorldTest.kt
+++ b/samples/app/hello-world/src/androidTest/java/com/badoo/ribs/samples/helloworld/HelloWorldTest.kt
@@ -7,10 +7,10 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import com.badoo.ribs.test.RibsRule
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.samples.helloworld.hello_world.HelloWorld
 import com.badoo.ribs.samples.helloworld.hello_world.builder.HelloWorldBuilder
+import com.badoo.ribs.test.RibsRule
 import org.hamcrest.Matchers.allOf
 import org.junit.Rule
 import org.junit.Test
@@ -37,7 +37,12 @@ class HelloWorldTest {
     fun showCountWhenClickingCountButton() {
         onView(withId(R.id.hello_world_button)).perform(click())
 
-        onView(allOf(withId(com.google.android.material.R.id.snackbar_text), withText("Current count: 1")))
+        onView(
+            allOf(
+                withId(com.google.android.material.R.id.snackbar_text),
+                withText("Current count: 1")
+            )
+        )
             .check(matches(isDisplayed()))
     }
 }
diff --git a/samples/app/hello-world/src/main/res/layout/activity_root.xml b/samples/app/hello-world/src/main/res/layout/activity_root.xml
index 69fe9578d..a1583d0e1 100644
--- a/samples/app/hello-world/src/main/res/layout/activity_root.xml
+++ b/samples/app/hello-world/src/main/res/layout/activity_root.xml
@@ -4,6 +4,4 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.badoo.ribs.samples.helloworld.app.RootActivity">
-
-</FrameLayout>
+    tools:context="com.badoo.ribs.samples.helloworld.app.RootActivity" />
diff --git a/samples/app/hello-world/src/main/res/layout/rib_hello_world.xml b/samples/app/hello-world/src/main/res/layout/rib_hello_world.xml
index 6f4b5d1a8..7918e1fa6 100644
--- a/samples/app/hello-world/src/main/res/layout/rib_hello_world.xml
+++ b/samples/app/hello-world/src/main/res/layout/rib_hello_world.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,21 +10,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/hello_world_text"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/hello_world_button"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <Button
         android:id="@+id/hello_world_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/show_count_button_text"
         android:layout_margin="16dp"
-        app:layout_constraintTop_toBottomOf="@id/hello_world_text"
+        android:text="@string/show_count_button_text"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/hello_world_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/app/unsplash-client/build.gradle b/samples/app/unsplash-client/build.gradle
index 98db9c9ec..eb63b7217 100644
--- a/samples/app/unsplash-client/build.gradle
+++ b/samples/app/unsplash-client/build.gradle
@@ -61,8 +61,8 @@ dependencies {
     implementation deps.android.browser
 
 
-    implementation deps.external.rxrelay2
-    implementation deps.external.rxandroid2
+    implementation deps.external.rxrelay3
+    implementation deps.external.rxandroid3
 
     implementation deps.retrofit.retrofit
     implementation deps.retrofit.rxjavaAdapter
@@ -72,7 +72,7 @@ dependencies {
     implementation deps.retrofit.moshiKotlin
 
     implementation project(":libraries:rib-base")
-    implementation project(':libraries:rib-rx2')
+    implementation project(':libraries:rib-rx3')
     implementation project(":libraries:rib-portal")
 
     implementation deps.external.mviCore
@@ -85,7 +85,7 @@ dependencies {
     testImplementation deps.test.mockitoKotlin
     testImplementation deps.test.assertj
     testImplementation project(":libraries:rib-base-test")
-    testImplementation project(":libraries:rib-base-test-rx2")
+    testImplementation project(':libraries:rib-base-test-rx3')
 
     junitAndroidTestImplementation(project)
     androidTestImplementation project(":libraries:rib-base-test")
diff --git a/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/FakeUserRepository.kt b/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/FakeUserRepository.kt
index e1616c3e7..366ea1c06 100644
--- a/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/FakeUserRepository.kt
+++ b/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/FakeUserRepository.kt
@@ -2,10 +2,10 @@ package com.badoo.ribs.example
 
 import com.badoo.ribs.example.network.model.User
 import com.badoo.ribs.example.repository.UserRepository
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Maybe
 
 class FakeUserRepository(
-        private val users: List<User>
+    private val users: List<User>
 ) : UserRepository {
 
     override fun getUserById(userId: String): Maybe<User> =
diff --git a/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/app_bar/AppBarTest.kt b/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/app_bar/AppBarTest.kt
index b38bac1ba..058a381a7 100644
--- a/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/app_bar/AppBarTest.kt
+++ b/samples/app/unsplash-client/src/androidTest/java/com/badoo/ribs/example/app_bar/AppBarTest.kt
@@ -3,8 +3,6 @@ package com.badoo.ribs.example.app_bar
 import android.content.Context
 import android.os.Bundle
 import androidx.test.platform.app.InstrumentationRegistry
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.example.FakeUserRepository
 import com.badoo.ribs.example.MY_ID
@@ -13,7 +11,9 @@ import com.badoo.ribs.example.R
 import com.badoo.ribs.example.element.AppBarElement
 import com.badoo.ribs.example.repository.UserRepository
 import com.badoo.ribs.example.rule.FakeImageLoaderRule
-import io.reactivex.observers.TestObserver
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/RootActivity.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/RootActivity.kt
index 23bddce63..67ef424ae 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/RootActivity.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/RootActivity.kt
@@ -22,10 +22,10 @@ import com.badoo.ribs.example.network.NetworkError
 import com.badoo.ribs.example.network.UnsplashApi
 import com.badoo.ribs.example.root.Root
 import com.badoo.ribs.example.root.RootBuilder
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
 
 class RootActivity : RibActivity(), AuthCodeDataSource {
 
@@ -41,7 +41,8 @@ class RootActivity : RibActivity(), AuthCodeDataSource {
         get() = findViewById(R.id.root)
 
     override fun createRib(savedInstanceState: Bundle?): Rib =
-        buildRootNode(root(
+        buildRootNode(
+            root(
             savedInstanceState = savedInstanceState,
             defaultPlugins = { node ->
                 if (BuildConfig.DEBUG) {
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBar.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBar.kt
index 5ac553148..3115586f5 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBar.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBar.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.example.app_bar
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.app_bar.AppBar.Input
 import com.badoo.ribs.example.app_bar.AppBar.Output
 import com.badoo.ribs.example.repository.UserRepository
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface AppBar : Rib, Connectable<Input, Output> {
 
@@ -16,8 +16,8 @@ interface AppBar : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object SearchClicked : Output()
-        object UserClicked : Output()
+        data object SearchClicked : Output()
+        data object UserClicked : Output()
     }
 
     class Customisation(
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarInteractor.kt
index 5081f11a1..67c50b3db 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarInteractor.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.example.app_bar
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.example.app_bar.AppBarBuilder.Params
@@ -10,7 +10,7 @@ import com.badoo.ribs.example.app_bar.mapper.UserToViewModel
 import com.badoo.ribs.example.app_bar.mapper.ViewEventToOutput
 import com.badoo.ribs.example.network.model.User
 import com.badoo.ribs.example.repository.UserRepository
-import io.reactivex.ObservableSource
+import io.reactivex.rxjava3.core.ObservableSource
 
 internal class AppBarInteractor(
     buildParams: BuildParams<Params>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarNode.kt
index db08db5e0..cf060f33b 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarNode.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.example.app_bar
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.app_bar.AppBar.Input
 import com.badoo.ribs.example.app_bar.AppBar.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class AppBarNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarView.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarView.kt
index adf6e8a98..c994c6095 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarView.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/AppBarView.kt
@@ -15,17 +15,17 @@ import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.app_bar.AppBarView.Event
 import com.badoo.ribs.example.app_bar.AppBarView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface AppBarView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object UserClicked : Event()
-        object SearchClicked : Event()
+        data object UserClicked : Event()
+        data object SearchClicked : Event()
     }
 
     data class ViewModel(
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/mapper/ViewEventToOutput.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/mapper/ViewEventToOutput.kt
index 6e29f68af..5cc1b2e0a 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/mapper/ViewEventToOutput.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/app_bar/mapper/ViewEventToOutput.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.example.app_bar.mapper
 import com.badoo.ribs.example.app_bar.AppBar.Output
 import com.badoo.ribs.example.app_bar.AppBarView.Event
 
-internal object ViewEventToOutput : (Event) -> Output? {
+internal object ViewEventToOutput : (Event) -> Output {
 
-    override fun invoke(event: Event): Output? =
+    override fun invoke(event: Event): Output =
         when (event) {
             is Event.UserClicked -> Output.UserClicked
             is Event.SearchClicked -> Output.SearchClicked
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthDataSource.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthDataSource.kt
index 6443f2d5b..bb147fcee 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthDataSource.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthDataSource.kt
@@ -3,8 +3,8 @@ package com.badoo.ribs.example.auth
 import com.badoo.ribs.example.BuildConfig
 import com.badoo.ribs.example.network.UnsplashApi
 import com.badoo.ribs.example.network.model.AccessToken
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
 
 interface AuthDataSource : AuthStateStorage {
     fun login(authCode: String): Single<AccessToken>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthState.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthState.kt
index 443c05e65..be755fdfb 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthState.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthState.kt
@@ -1,7 +1,7 @@
 package com.badoo.ribs.example.auth
 
 sealed class AuthState {
-    object Unauthenticated : AuthState()
-    object Anonymous : AuthState()
+    data object Unauthenticated : AuthState()
+    data object Anonymous : AuthState()
     data class Authenticated(val accessToken: String) : AuthState()
 }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStatePersistence.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStatePersistence.kt
index 43bc83e3e..6c42f3a7e 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStatePersistence.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStatePersistence.kt
@@ -16,10 +16,12 @@ class PreferencesAuthStatePersistence(
             is AuthState.Unauthenticated -> preferences.edit()
                 .clear()
                 .apply()
+
             is AuthState.Anonymous -> preferences.edit()
                 .clear()
                 .putBoolean(ANONYMOUS_AUTH_KEY, true)
                 .apply()
+
             is AuthState.Authenticated -> preferences.edit()
                 .clear()
                 .putString(ACCESS_TOKEN_KEY, state.accessToken)
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStateStorage.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStateStorage.kt
index ea1b18ace..359003cd1 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStateStorage.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/auth/AuthStateStorage.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.example.auth
 
 import android.util.Log
-import com.jakewharton.rxrelay2.BehaviorRelay
-import io.reactivex.Observable
+import com.jakewharton.rxrelay3.BehaviorRelay
+import io.reactivex.rxjava3.core.Observable
 
 interface AuthStateStorage {
     val authUpdates: Observable<AuthState>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/extensions/RxExt.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/extensions/RxExt.kt
index f903e3bcb..dbba475e1 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/extensions/RxExt.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/extensions/RxExt.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.example.extensions
 
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
-fun <T> T?.toObservable(): Observable<T> =
+fun <T : Any> T?.toObservable(): Observable<T> =
     if (this == null) Observable.empty() else Observable.just(this)
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainer.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainer.kt
index 1ce5ee975..55950ae21 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainer.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainer.kt
@@ -1,6 +1,5 @@
 package com.badoo.ribs.example.feed_container
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthDataSource
@@ -9,6 +8,7 @@ import com.badoo.ribs.example.feed_container.FeedContainer.Output
 import com.badoo.ribs.example.feed_container.routing.FeedContainerRouter
 import com.badoo.ribs.example.network.UnsplashApi
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface FeedContainer : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerInteractor.kt
index 379aa3761..c34559866 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerInteractor.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.example.feed_container
 
 import androidx.lifecycle.Lifecycle
+import com.badoo.binder.using
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.mvicore.android.lifecycle.startStop
-import com.badoo.binder.using
 import com.badoo.ribs.clienthelper.childaware.whenChildBuilt
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerNode.kt
index 4443c86d9..c352062cd 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/FeedContainerNode.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.example.feed_container
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.feed_container.FeedContainer.Input
 import com.badoo.ribs.example.feed_container.FeedContainer.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class FeedContainerNode internal constructor(
     buildParams: BuildParams<*>,
@@ -18,6 +18,4 @@ class FeedContainerNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), FeedContainer, Connectable<Input, Output> by connector {
-
-}
+), FeedContainer, Connectable<Input, Output> by connector
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/mapper/FeedOutputToContainerOutput.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/mapper/FeedOutputToContainerOutput.kt
index 03e1b892f..7eedb8f41 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/mapper/FeedOutputToContainerOutput.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/mapper/FeedOutputToContainerOutput.kt
@@ -3,8 +3,8 @@ package com.badoo.ribs.example.feed_container.mapper
 import com.badoo.ribs.example.feed_container.FeedContainer
 import com.badoo.ribs.example.photo_feed.PhotoFeed
 
-internal object FeedOutputToContainerOutput : (PhotoFeed.Output) -> FeedContainer.Output? {
-    override fun invoke(output: PhotoFeed.Output): FeedContainer.Output? =
+internal object FeedOutputToContainerOutput : (PhotoFeed.Output) -> FeedContainer.Output {
+    override fun invoke(output: PhotoFeed.Output): FeedContainer.Output =
         when (output) {
             is PhotoFeed.Output.PhotoClicked -> FeedContainer.Output.PhotoClicked(output.photo.id)
         }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/routing/FeedContainerRouter.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/routing/FeedContainerRouter.kt
index e5fccaf64..e4dd20c44 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/routing/FeedContainerRouter.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/feed_container/routing/FeedContainerRouter.kt
@@ -25,10 +25,10 @@ class FeedContainerRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
             @Parcelize
-            object AppBar : Configuration()
+            data object AppBar : Configuration()
 
             @Parcelize
-            object PhotoFeed : Configuration()
+            data object PhotoFeed : Configuration()
         }
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainer.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainer.kt
index c06bf491a..a399cd567 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainer.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainer.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.example.logged_in_container
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthDataSource
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerInteractor.kt
index 6e9f88666..66014e1c4 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerInteractor.kt
@@ -10,7 +10,7 @@ import com.badoo.ribs.example.logged_in_container.routing.LoggedInContainerRoute
 import com.badoo.ribs.example.logged_in_container.routing.LoggedInContainerRouter.Configuration.Content
 import com.badoo.ribs.portal.Portal
 import com.badoo.ribs.routing.source.backstack.BackStack
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class LoggedInContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerNode.kt
index fe556c5d2..17364e5e1 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/LoggedInContainerNode.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.example.logged_in_container
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.example.logged_in_container.LoggedInContainer.Input
 import com.badoo.ribs.example.logged_in_container.LoggedInContainer.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class LoggedInContainerNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/routing/LoggedInContainerRouter.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/routing/LoggedInContainerRouter.kt
index dd7490093..b08d8f4b6 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/routing/LoggedInContainerRouter.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_in_container/routing/LoggedInContainerRouter.kt
@@ -27,7 +27,7 @@ class LoggedInContainerRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize
-            object PhotoFeed : Content()
+            data object PhotoFeed : Content()
 
             @Parcelize
             data class PhotoDetails(val photoId: String) : Content()
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainer.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainer.kt
index 951d244e6..2e7e99f57 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainer.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainer.kt
@@ -1,7 +1,6 @@
 package com.badoo.ribs.example.logged_out_container
 
 import com.badoo.ribs.android.activitystarter.CanProvideActivityStarter
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthDataSource
@@ -10,6 +9,7 @@ import com.badoo.ribs.example.logged_out_container.LoggedOutContainer.Output
 import com.badoo.ribs.example.logged_out_container.routing.LoggedOutContainerRouter
 import com.badoo.ribs.example.login.AuthCodeDataSource
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface LoggedOutContainer : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerInteractor.kt
index ca263c500..9abe514b7 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerInteractor.kt
@@ -11,7 +11,7 @@ import com.badoo.ribs.example.logged_out_container.routing.LoggedOutContainerRou
 import com.badoo.ribs.example.welcome.Welcome
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class LoggedOutContainerInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerNode.kt
index c14a711ba..4c5f27f1c 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/LoggedOutContainerNode.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.example.logged_out_container
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.example.logged_out_container.LoggedOutContainer.Input
 import com.badoo.ribs.example.logged_out_container.LoggedOutContainer.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class LoggedOutContainerNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/routing/LoggedOutContainerRouter.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/routing/LoggedOutContainerRouter.kt
index 199caff6c..181985120 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/routing/LoggedOutContainerRouter.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/logged_out_container/routing/LoggedOutContainerRouter.kt
@@ -26,11 +26,13 @@ class LoggedOutContainerRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize
-            object Welcome : Content()
+            data object Welcome : Content()
+
             @Parcelize
-            object Login : Content()
+            data object Login : Content()
+
             @Parcelize
-            object Register : Content()
+            data object Register : Content()
         }
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/AuthCodeDataSource.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/AuthCodeDataSource.kt
index 179c536b6..7e7ced9d8 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/AuthCodeDataSource.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/AuthCodeDataSource.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.example.login
 
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
 interface AuthCodeDataSource {
     fun getAuthCodeUpdates(): Observable<String>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/Login.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/Login.kt
index 97ba56ff2..7f9b397d3 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/Login.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/Login.kt
@@ -6,7 +6,7 @@ import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthDataSource
 import com.badoo.ribs.example.login.Login.Input
 import com.badoo.ribs.example.login.Login.Output
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface Login : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/LoginNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/LoginNode.kt
index 8db9a49f9..bd7e21673 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/LoginNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/LoginNode.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.example.login
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.example.login.Login.Input
 import com.badoo.ribs.example.login.Login.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class LoginNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/feature/LoginFeature.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/feature/LoginFeature.kt
index 75b065963..f9508af4c 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/feature/LoginFeature.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/login/feature/LoginFeature.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.example.login.AuthCodeDataSource
 import com.badoo.ribs.example.login.feature.LoginFeature.Effect
 import com.badoo.ribs.example.login.feature.LoginFeature.State
 import com.badoo.ribs.example.login.feature.LoginFeature.Wish
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
 internal class LoginFeature(
     authCodeDataSource: AuthCodeDataSource,
@@ -31,8 +31,8 @@ internal class LoginFeature(
     }
 
     sealed class Effect {
-        object AuthSuccess : Effect()
-        object AuthInProgress : Effect()
+        data object AuthSuccess : Effect()
+        data object AuthInProgress : Effect()
         class AuthFailed(val error: Throwable?) : Effect()
     }
 
@@ -58,7 +58,7 @@ internal class LoginFeature(
                 .login(authCode)
                 .toObservable()
                 .map<Effect> { Effect.AuthSuccess }
-                .startWith(Effect.AuthInProgress)
+                .startWithItem(Effect.AuthInProgress)
                 .onErrorReturn { Effect.AuthFailed(it) }
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/ApiFactory.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/ApiFactory.kt
index 22b4b401f..dc211283f 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/ApiFactory.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/ApiFactory.kt
@@ -3,13 +3,13 @@ package com.badoo.ribs.example.network
 import com.badoo.ribs.example.auth.AuthStateStorage
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import io.reactivex.functions.Consumer
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.functions.Consumer
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 object ApiFactory {
@@ -39,7 +39,7 @@ object ApiFactory {
 
     private fun retrofit(client: OkHttpClient, baseUrl: String): Retrofit = Retrofit.Builder()
         .client(client)
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
+        .addCallAdapterFactory(RxJava3CallAdapterFactory.createWithScheduler(Schedulers.io()))
         .addConverterFactory(
             MoshiConverterFactory.create(
                 Moshi.Builder()
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/NetworkError.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/NetworkError.kt
index 4163248f1..76dc5d363 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/NetworkError.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/NetworkError.kt
@@ -1,5 +1,5 @@
 package com.badoo.ribs.example.network
 
 sealed class NetworkError {
-    object Unauthorized: NetworkError()
+    data object Unauthorized : NetworkError()
 }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnauthorizedErrorInterceptor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnauthorizedErrorInterceptor.kt
index 22b67985c..94b68ba48 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnauthorizedErrorInterceptor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnauthorizedErrorInterceptor.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.example.network
 
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 import okhttp3.Interceptor
 import okhttp3.Response
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnsplashApi.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnsplashApi.kt
index b517190b3..6c2e9223f 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnsplashApi.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/network/UnsplashApi.kt
@@ -5,8 +5,8 @@ import com.badoo.ribs.example.network.model.Collection
 import com.badoo.ribs.example.network.model.Photo
 import com.badoo.ribs.example.network.model.SearchResult
 import com.badoo.ribs.example.network.model.User
-import io.reactivex.Completable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -14,16 +14,15 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 import retrofit2.http.Url
 
-
 interface UnsplashApi {
 
     /**
      * https://unsplash.com/documentation#authorization-workflow
      */
     @SuppressWarnings("LongParameterList")
-    @POST()
+    @POST
     fun requestAccessToken(
-        @Url url:String = "https://unsplash.com/oauth/token",
+        @Url url: String = "https://unsplash.com/oauth/token",
         @Query("client_id") clientId: String,
         @Query("client_secret") clientSecret: String,
         @Query("redirect_uri") redirectUri: String,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetails.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetails.kt
index 39d9c1629..5d69e1d19 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetails.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetails.kt
@@ -7,7 +7,7 @@ import com.badoo.ribs.example.photo_details.PhotoDetails.Output
 import com.badoo.ribs.example.photo_details.routing.PhotoDetailsRouter
 import com.badoo.ribs.portal.CanProvidePortal
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface PhotoDetails : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsDataSource.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsDataSource.kt
index 415f65656..48c91a1a9 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsDataSource.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsDataSource.kt
@@ -2,14 +2,14 @@ package com.badoo.ribs.example.photo_details
 
 import com.badoo.ribs.example.network.UnsplashApi
 import com.badoo.ribs.example.network.model.Photo
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
 
 interface PhotoDetailsDataSource {
     fun getPhoto(id: String): Single<Photo>
 
-    fun likePhoto(id: String):  Single<Unit>
-    fun unlikePhoto(id: String):  Single<Unit>
+    fun likePhoto(id: String): Single<Unit>
+    fun unlikePhoto(id: String): Single<Unit>
 }
 
 
@@ -22,7 +22,7 @@ class PhotoDetailsDataSourceImpl(private val api: UnsplashApi) : PhotoDetailsDat
         api.likePhoto(id)
             .observeOn(AndroidSchedulers.mainThread())
 
-    override fun unlikePhoto(id: String):  Single<Unit> =
+    override fun unlikePhoto(id: String): Single<Unit> =
         api.unlikePhoto(id)
             .observeOn(AndroidSchedulers.mainThread())
 }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsInteractor.kt
index 9c46b2fc7..1dff4c3e7 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsInteractor.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.example.photo_details
 
 import androidx.lifecycle.Lifecycle
+import com.badoo.binder.using
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.mvicore.android.lifecycle.startStop
-import com.badoo.binder.using
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsNode.kt
index f011cb925..27607da6d 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsNode.kt
@@ -6,8 +6,8 @@ import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.photo_details.PhotoDetails.Input
 import com.badoo.ribs.example.photo_details.PhotoDetails.Output
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class PhotoDetailsNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsView.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsView.kt
index 050401ce9..4bb9b1991 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsView.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/PhotoDetailsView.kt
@@ -19,20 +19,20 @@ import com.badoo.ribs.example.network.model.Photo
 import com.badoo.ribs.example.photo_details.PhotoDetailsView.Event
 import com.badoo.ribs.example.photo_details.PhotoDetailsView.ViewModel
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface PhotoDetailsView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object LikeClicked : Event()
+        data object LikeClicked : Event()
     }
 
     sealed class ViewModel {
-        object Loading : ViewModel()
+        data object Loading : ViewModel()
         data class Loaded(val detail: Photo) : ViewModel()
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/feature/PhotoDetailsFeature.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/feature/PhotoDetailsFeature.kt
index 8d60a465b..5620e968c 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/feature/PhotoDetailsFeature.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/feature/PhotoDetailsFeature.kt
@@ -12,7 +12,7 @@ import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature.Effect
 import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature.News
 import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature.State
 import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature.Wish
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
 internal class PhotoDetailsFeature(
     photoId: String,
@@ -27,25 +27,25 @@ internal class PhotoDetailsFeature(
 
 
     sealed class State {
-        object Loading : State()
+        data object Loading : State()
         data class Loaded(val detail: Photo) : State()
     }
 
     sealed class Wish {
-        object LoadPhoto : Wish()
-        object LikeOrUnlikePhoto : Wish()
+        data object LoadPhoto : Wish()
+        data object LikeOrUnlikePhoto : Wish()
     }
 
     sealed class Effect {
-        object LoadingPhotoStarted : Effect()
+        data object LoadingPhotoStarted : Effect()
         data class PhotoLoaded(val detail: Photo) : Effect()
-        object LikeSent : Effect()
-        object UnlikeSent : Effect()
-        object LikeNotSent : Effect()
+        data object LikeSent : Effect()
+        data object UnlikeSent : Effect()
+        data object LikeNotSent : Effect()
     }
 
     sealed class News {
-        object LikeOrUnlikeFailed : News()
+        data object LikeOrUnlikeFailed : News()
     }
 
     class BootStrapperImpl : Bootstrapper<Wish> {
@@ -61,7 +61,8 @@ internal class PhotoDetailsFeature(
                 Wish.LoadPhoto -> photoDetailsDataSource.getPhoto(photoId)
                     .map<Effect> { Effect.PhotoLoaded(it) }
                     .toObservable()
-                    .startWith(Effect.LoadingPhotoStarted)
+                    .startWithItem(Effect.LoadingPhotoStarted)
+
                 Wish.LikeOrUnlikePhoto -> togglePhotoLike(state)
             }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/mapper/ViewEventToWish.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/mapper/ViewEventToWish.kt
index 1bc9c9d6d..0a09a378a 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/mapper/ViewEventToWish.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_details/mapper/ViewEventToWish.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.example.photo_details.mapper
 import com.badoo.ribs.example.photo_details.PhotoDetailsView.Event
 import com.badoo.ribs.example.photo_details.feature.PhotoDetailsFeature.Wish
 
-internal object ViewEventToWish : (Event) -> Wish? {
+internal object ViewEventToWish : (Event) -> Wish {
 
-    override fun invoke(event: Event): Wish? =
+    override fun invoke(event: Event): Wish =
         when (event) {
             is Event.LikeClicked -> Wish.LikeOrUnlikePhoto
         }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeed.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeed.kt
index 32c3ebb3e..2d6b9ca1b 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeed.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeed.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.example.photo_feed
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.photo_feed.PhotoFeed.Input
 import com.badoo.ribs.example.photo_feed.PhotoFeed.Output
 import com.badoo.ribs.example.photo_feed.view.PhotoFeedView
 import com.badoo.ribs.example.photo_feed.view.PhotoFeedViewImpl
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface PhotoFeed : Rib, Connectable<Input, Output> {
 
@@ -17,7 +17,7 @@ interface PhotoFeed : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        data class PhotoClicked(val photo: Photo): Output()
+        data class PhotoClicked(val photo: Photo) : Output()
     }
 
     class Customisation(
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedDataSource.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedDataSource.kt
index 2e62f455a..828b95ac9 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedDataSource.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedDataSource.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.example.photo_feed
 
 import com.badoo.ribs.example.network.UnsplashApi
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
 
 interface PhotoFeedDataSource {
     fun loadPhotos(page: Int = 0): Single<List<Photo>>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedInteractor.kt
index d4116925b..ff5ff0714 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedInteractor.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.example.photo_feed
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.example.photo_feed.feature.PhotoFeedFeature
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedNode.kt
index 626bb8571..22dcfc177 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/PhotoFeedNode.kt
@@ -1,7 +1,5 @@
 package com.badoo.ribs.example.photo_feed
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
@@ -9,6 +7,8 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.photo_feed.PhotoFeed.Input
 import com.badoo.ribs.example.photo_feed.PhotoFeed.Output
 import com.badoo.ribs.example.photo_feed.view.PhotoFeedView
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class PhotoFeedNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/feature/PhotoFeedFeature.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/feature/PhotoFeedFeature.kt
index c8e8d9684..b63bd868d 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/feature/PhotoFeedFeature.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/feature/PhotoFeedFeature.kt
@@ -12,7 +12,7 @@ import com.badoo.ribs.example.photo_feed.feature.PhotoFeedFeature.Effect
 import com.badoo.ribs.example.photo_feed.feature.PhotoFeedFeature.News
 import com.badoo.ribs.example.photo_feed.feature.PhotoFeedFeature.State
 import com.badoo.ribs.example.photo_feed.feature.PhotoFeedFeature.Wish
-import io.reactivex.Observable
+import io.reactivex.rxjava3.core.Observable
 
 internal class PhotoFeedFeature(
     dataSource: PhotoFeedDataSource
@@ -28,8 +28,8 @@ internal class PhotoFeedFeature(
         open val pageNumber: Int = firstPageNumber,
         open val photos: List<Photo> = emptyList()
     ) {
-        object InitialLoading : State()
-        object InitialLoadingError : State()
+        data object InitialLoading : State()
+        data object InitialLoadingError : State()
         data class Loaded(
             override val photos: List<Photo>,
             override val pageNumber: Int
@@ -51,15 +51,15 @@ internal class PhotoFeedFeature(
     }
 
     sealed class Wish {
-        object LoadNextPage : Wish()
-        object Refresh : Wish()
+        data object LoadNextPage : Wish()
+        data object Refresh : Wish()
     }
 
     sealed class Effect {
-        object LoadingStarted : Effect()
+        data object LoadingStarted : Effect()
         data class PageLoaded(val photos: List<Photo>, val pageNumber: Int) : Effect()
-        object LoadingFailed : Effect()
-        object PhotosCleared : Effect()
+        data object LoadingFailed : Effect()
+        data object PhotosCleared : Effect()
     }
 
     sealed class News
@@ -78,7 +78,7 @@ internal class PhotoFeedFeature(
                         is State.InitialLoading, is State.LoadingNext -> Observable.empty()
                         else -> loadPage(state.pageNumber)
                     }
-                is Wish.Refresh -> loadPage(0).startWith(Effect.PhotosCleared)
+                is Wish.Refresh -> loadPage(0).startWithItem(Effect.PhotosCleared)
             }
 
         private fun loadPage(pageNumber: Int): Observable<Effect> {
@@ -88,7 +88,7 @@ internal class PhotoFeedFeature(
                 }
                 .onErrorReturnItem(Effect.LoadingFailed)
                 .toObservable()
-                .startWith(Effect.LoadingStarted)
+                .startWithItem(Effect.LoadingStarted)
         }
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoFeedView.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoFeedView.kt
index 4b034f84b..c98418a9f 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoFeedView.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoFeedView.kt
@@ -19,18 +19,18 @@ import com.badoo.ribs.example.photo_feed.Photo
 import com.badoo.ribs.example.photo_feed.view.PhotoFeedView.Event
 import com.badoo.ribs.example.photo_feed.view.PhotoFeedView.ViewModel
 import com.badoo.ribs.example.photo_feed.view.PhotoListItem.PhotoItem
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface PhotoFeedView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ScrolledToTheEnd : Event()
-        object RetryInitialLoadingClicked : Event()
-        object RetryNextPageLoadingClicked : Event()
+        data object ScrolledToTheEnd : Event()
+        data object RetryInitialLoadingClicked : Event()
+        data object RetryNextPageLoadingClicked : Event()
         data class PhotoClicked(val photo: Photo) : Event()
     }
 
@@ -39,8 +39,8 @@ interface PhotoFeedView : RibView,
         data class Loaded(val photos: List<Photo>) : ViewModel()
         data class LoadingNext(val photos: List<Photo>) : ViewModel()
         data class LoadingNextError(val photos: List<Photo>) : ViewModel()
-        object InitialLoading : ViewModel()
-        object InitialLoadingError : ViewModel()
+        data object InitialLoading : ViewModel()
+        data object InitialLoadingError : ViewModel()
 
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItem.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItem.kt
index dcba4fa63..26143419f 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItem.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItem.kt
@@ -5,7 +5,7 @@ import com.badoo.ribs.example.photo_feed.Photo
 sealed class PhotoListItem(val id: String) {
 
     data class PhotoItem(val photo: Photo, val onClicked: (Photo) -> Unit) : PhotoListItem(photo.id)
-    object NextPageLoadingItem : PhotoListItem("nextPageLoading")
+    data object NextPageLoadingItem : PhotoListItem("nextPageLoading")
     data class NextPageLoadingErrorItem(val onClicked: () -> Unit) :
         PhotoListItem("nextPageLoadingError")
 }
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItemViewHolder.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItemViewHolder.kt
index 81fbfd52a..1dcb7100e 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItemViewHolder.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotoListItemViewHolder.kt
@@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import com.badoo.ribs.example.R
 
-
 abstract class PhotoListItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
 internal class PhotoViewHolder(private val photoView: AspectRatioImageView) :
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotosAdapter.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotosAdapter.kt
index 8a727c8db..66b06fde0 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotosAdapter.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/photo_feed/view/PhotosAdapter.kt
@@ -14,12 +14,12 @@ internal class PhotosAdapter : ListAdapter<PhotoListItem, PhotoListItemViewHolde
                 parent.context,
                 parent
             )
+
             else -> throw IllegalArgumentException("View type $viewType is not supported by this adapter")
         }
 
     override fun onBindViewHolder(holder: PhotoListItemViewHolder, position: Int) {
-        val item = getItem(position)
-        when (item) {
+        when (val item = getItem(position)) {
             is PhotoListItem.PhotoItem -> (holder as? PhotoViewHolder)?.bind(item)
             is PhotoListItem.NextPageLoadingItem -> (holder as? NextPageLoadingViewHolder)?.bind()
             is PhotoListItem.NextPageLoadingErrorItem ->
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/repository/UserRepository.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/repository/UserRepository.kt
index c0151a792..a91131a7d 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/repository/UserRepository.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/repository/UserRepository.kt
@@ -1,7 +1,7 @@
 package com.badoo.ribs.example.repository
 
 import com.badoo.ribs.example.network.model.User
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Maybe
 
 interface UserRepository {
     fun getUserById(userId: String): Maybe<User>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/Root.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/Root.kt
index ad63e34c8..6661c9b51 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/Root.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/Root.kt
@@ -1,7 +1,6 @@
 package com.badoo.ribs.example.root
 
 import com.badoo.ribs.android.activitystarter.CanProvideActivityStarter
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthStateStorage
@@ -12,7 +11,8 @@ import com.badoo.ribs.example.root.Root.Input
 import com.badoo.ribs.example.root.Root.Output
 import com.badoo.ribs.example.root.routing.RootRouter
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import io.reactivex.Observable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import io.reactivex.rxjava3.core.Observable
 
 interface Root : Rib, Connectable<Input, Output> {
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootInteractor.kt
index 1fc23371a..9adb65608 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootInteractor.kt
@@ -14,8 +14,8 @@ import com.badoo.ribs.example.root.routing.RootRouter.Configuration.Content.Logi
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.routing.source.backstack.operation.replace
-import io.reactivex.Observable
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class RootInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootNode.kt
index 4b34ea0b7..b49364b9e 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/RootNode.kt
@@ -1,12 +1,12 @@
 package com.badoo.ribs.example.root
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.example.root.Root.Input
 import com.badoo.ribs.example.root.Root.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class RootNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/routing/RootRouter.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/routing/RootRouter.kt
index 30d6793f7..90808a8d3 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/routing/RootRouter.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/root/routing/RootRouter.kt
@@ -25,13 +25,13 @@ class RootRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize
-            object LoggedIn : Content()
+            data object LoggedIn : Content()
 
             @Parcelize
-            object LoggedOut : Content()
+            data object LoggedOut : Content()
 
             @Parcelize
-            object Login : Content()
+            data object Login : Content()
         }
     }
 
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/Welcome.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/Welcome.kt
index feec20b6f..0af9bf52f 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/Welcome.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/Welcome.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.example.welcome
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.example.auth.AuthDataSource
 import com.badoo.ribs.example.welcome.Welcome.Input
 import com.badoo.ribs.example.welcome.Welcome.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 
 interface Welcome : Rib, Connectable<Input, Output> {
 
@@ -16,8 +16,8 @@ interface Welcome : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object RegisterClicked : Output()
-        object LoginClicked : Output()
+        data object RegisterClicked : Output()
+        data object LoginClicked : Output()
     }
 
     class Customisation(
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeInteractor.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeInteractor.kt
index c2ef3282b..b3960da95 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeInteractor.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeInteractor.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.example.welcome
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.example.auth.AuthDataSource
 import com.badoo.ribs.example.welcome.mapper.ViewEventToOutput
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class WelcomeInteractor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeNode.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeNode.kt
index 6dc9ca0cb..e1a3fba97 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeNode.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeNode.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.example.welcome
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.welcome.Welcome.Input
 import com.badoo.ribs.example.welcome.Welcome.Output
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class WelcomeNode internal constructor(
     buildParams: BuildParams<*>,
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeView.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeView.kt
index ae7c99ca8..0f7be055a 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeView.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/WelcomeView.kt
@@ -10,16 +10,16 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.welcome.WelcomeView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
 
 interface WelcomeView : RibView,
     ObservableSource<Event> {
 
     sealed class Event {
-        object LoginClicked : Event()
-        object RegisterClicked : Event()
-        object SkipClicked : Event()
+        data object LoginClicked : Event()
+        data object RegisterClicked : Event()
+        data object SkipClicked : Event()
     }
 
     interface Factory : ViewFactoryBuilder<Nothing?, WelcomeView>
diff --git a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/mapper/ViewEventToOutput.kt b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/mapper/ViewEventToOutput.kt
index 5da4366d6..afa909216 100644
--- a/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/mapper/ViewEventToOutput.kt
+++ b/samples/app/unsplash-client/src/main/java/com/badoo/ribs/example/welcome/mapper/ViewEventToOutput.kt
@@ -3,7 +3,6 @@ package com.badoo.ribs.example.welcome.mapper
 import com.badoo.ribs.example.welcome.Welcome.Output
 import com.badoo.ribs.example.welcome.WelcomeView
 
-
 internal object ViewEventToOutput : (WelcomeView.Event) -> Output? {
     override fun invoke(event: WelcomeView.Event): Output? =
         when (event) {
diff --git a/samples/app/unsplash-client/src/main/res/layout/debug_switcher.xml b/samples/app/unsplash-client/src/main/res/layout/debug_switcher.xml
index 81636d8c8..3c9f5a8c7 100644
--- a/samples/app/unsplash-client/src/main/res/layout/debug_switcher.xml
+++ b/samples/app/unsplash-client/src/main/res/layout/debug_switcher.xml
@@ -3,10 +3,10 @@
     android:id="@+id/debug_switcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="24dp"
-    android:orientation="horizontal"
     android:layout_gravity="center"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="24dp">
 
     <Button
         android:id="@+id/workflow_1"
@@ -18,6 +18,6 @@
         android:id="@+id/workflow_2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Workflow 2"/>
+        android:text="Workflow 2" />
 
 </LinearLayout>
diff --git a/samples/app/unsplash-client/src/main/res/layout/example_activity_root.xml b/samples/app/unsplash-client/src/main/res/layout/example_activity_root.xml
index eb5b08cb0..9aba5b9ed 100644
--- a/samples/app/unsplash-client/src/main/res/layout/example_activity_root.xml
+++ b/samples/app/unsplash-client/src/main/res/layout/example_activity_root.xml
@@ -21,7 +21,7 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true" >
+            android:fillViewport="true">
 
             <LinearLayout
                 android:id="@+id/debug_controls_host"
diff --git a/samples/app/unsplash-client/src/main/res/layout/rib_app_bar.xml b/samples/app/unsplash-client/src/main/res/layout/rib_app_bar.xml
index cfde78afa..eab1e11a8 100644
--- a/samples/app/unsplash-client/src/main/res/layout/rib_app_bar.xml
+++ b/samples/app/unsplash-client/src/main/res/layout/rib_app_bar.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_app_bar"
-    app:contentInsetStart="0dp"
-    app:contentInsetEnd="0dp"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:contentInsetEnd="0dp"
+    app:contentInsetStart="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/toolbar_contents"
@@ -15,42 +14,39 @@
         android:layout_height="?actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" >
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/toolbar_action_start"
             android:layout_width="?actionBarSize"
             android:layout_height="0dp"
+            android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:src="@drawable/ic_launcher_background"
-            android:padding="12dp"
-            />
+            tools:src="@drawable/ic_launcher_background" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/toolbar_action_end"
             android:layout_width="?actionBarSize"
             android:layout_height="0dp"
-            android:src="@drawable/ic_search"
             android:padding="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            android:src="@drawable/ic_search"
             app:layout_constraintBottom_toBottomOf="parent"
-            />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/toolbar_title"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:gravity="center"
+            android:text="@string/app_name"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/toolbar_action_start"
-            app:layout_constraintTop_toTopOf="parent"
-            android:text="@string/app_name"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/samples/app/unsplash-client/src/main/res/layout/rib_login.xml b/samples/app/unsplash-client/src/main/res/layout/rib_login.xml
index 197f5e8e5..b3c2a8a02 100644
--- a/samples/app/unsplash-client/src/main/res/layout/rib_login.xml
+++ b/samples/app/unsplash-client/src/main/res/layout/rib_login.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_login"
     android:layout_width="match_parent"
@@ -10,9 +9,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Let's have a drink in the Foo Bar"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/ExampleUnitTest.kt b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/ExampleUnitTest.kt
index 1c46d2ce3..3d7c21942 100644
--- a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/ExampleUnitTest.kt
+++ b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.badoo.ribs.example
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
diff --git a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/RxSchedulerExtension.kt b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/RxSchedulerExtension.kt
index 94a48eaf7..945ea2688 100644
--- a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/RxSchedulerExtension.kt
+++ b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/RxSchedulerExtension.kt
@@ -1,10 +1,10 @@
 package com.badoo.ribs.example
 
-import io.reactivex.Scheduler
-import io.reactivex.android.plugins.RxAndroidPlugins
-import io.reactivex.functions.Function
-import io.reactivex.plugins.RxJavaPlugins
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.plugins.RxAndroidPlugins
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.functions.Function
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
 import org.junit.jupiter.api.extension.AfterEachCallback
 import org.junit.jupiter.api.extension.BeforeEachCallback
 import org.junit.jupiter.api.extension.ExtensionContext
diff --git a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/auth/AuthDataSourceImplTest.kt b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/auth/AuthDataSourceImplTest.kt
index be0725e54..63081688d 100644
--- a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/auth/AuthDataSourceImplTest.kt
+++ b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/auth/AuthDataSourceImplTest.kt
@@ -3,14 +3,14 @@ package com.badoo.ribs.example.auth
 import com.badoo.ribs.example.RxSchedulerRule
 import com.badoo.ribs.example.network.UnsplashApi
 import com.badoo.ribs.example.network.model.AccessToken
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.whenever
-import io.reactivex.Single
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.observers.TestObserver
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 class AuthDataSourceImplTest {
     private lateinit var authDataSource: AuthDataSourceImpl
@@ -138,7 +138,7 @@ class AuthDataSourceImplTest {
 }
 
 
-fun <T> TestObserver<T>.assertLastValueEqual(value: T) {
-    assertThat(this.valueCount()).isGreaterThan(0)
-    this.assertValueAt(valueCount() - 1, value)
+fun <T: Any> TestObserver<T>.assertLastValueEqual(value: T) {
+    assertThat(this.values().size).isGreaterThan(0)
+    this.assertValueAt(values().size - 1, value)
 }
diff --git a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/root/RootInteractorAuthStateTest.kt b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/root/RootInteractorAuthStateTest.kt
index e98f3bd81..c3064a35b 100644
--- a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/root/RootInteractorAuthStateTest.kt
+++ b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/root/RootInteractorAuthStateTest.kt
@@ -9,7 +9,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.replace
 import com.badoo.ribs.test.InteractorTestHelper
 import com.badoo.ribs.test.emptyBuildParams
-import com.jakewharton.rxrelay2.PublishRelay
+import com.jakewharton.rxrelay3.PublishRelay
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.params.ParameterizedTest
diff --git a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/welcome/WelcomeInteractorTest.kt b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/welcome/WelcomeInteractorTest.kt
index 7596131ef..6d0b83634 100644
--- a/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/welcome/WelcomeInteractorTest.kt
+++ b/samples/app/unsplash-client/src/test/java/com/badoo/ribs/example/welcome/WelcomeInteractorTest.kt
@@ -1,20 +1,20 @@
 package com.badoo.ribs.example.welcome
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.common.ribs.rx2.subscribedView
+import com.badoo.common.ribs.rx3.subscribedView
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.example.auth.AuthDataSource
 import com.badoo.ribs.example.welcome.Welcome.Output
 import com.badoo.ribs.example.welcome.WelcomeView.Event
 import com.badoo.ribs.test.InteractorTestHelper
 import com.badoo.ribs.test.emptyBuildParams
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
-import io.reactivex.observers.TestObserver
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 
 class WelcomeInteractorTest {
 
diff --git a/samples/elements/android-integration/dialogs/build.gradle b/samples/elements/android-integration/dialogs/build.gradle
index 27dbf311d..c65d0eeb8 100644
--- a/samples/elements/android-integration/dialogs/build.gradle
+++ b/samples/elements/android-integration/dialogs/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation deps.android.appCompat
     implementation deps.android.constraintLayout
     implementation deps.android.design
-    implementation deps.external.rxrelay2
+    implementation deps.external.rxrelay3
     implementation deps.external.mviCore
     implementation deps.external.mviCoreAndroid
     implementation deps.external.mviCoreBinder
diff --git a/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/DialogsExampleTest.kt b/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/DialogsExampleTest.kt
index 3e2c9ba88..c83e207bf 100644
--- a/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/DialogsExampleTest.kt
+++ b/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/DialogsExampleTest.kt
@@ -5,20 +5,23 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers.isDialog
-import androidx.test.espresso.matcher.ViewMatchers.*
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.badoo.ribs.android.dialog.DialogLauncher
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExample
 import com.badoo.ribs.samples.android.dialogs.rib.dialogs_example.DialogsExampleBuilder
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
 import org.junit.Rule
 import org.junit.Test
 
 class DialogsExampleTest {
 
     @get:Rule
-    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
+    val ribsRule =
+        RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
 
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         DialogsExampleBuilder(object : DialogsExample.Dependency {
diff --git a/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/TextColorMatcher.kt b/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/TextColorMatcher.kt
index 16fdf4e5a..e4066ea57 100644
--- a/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/TextColorMatcher.kt
+++ b/samples/elements/android-integration/dialogs/src/androidTest/java/com/badoo/ribs/samples/android/dialogs/TextColorMatcher.kt
@@ -9,13 +9,17 @@ import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.core.Is.`is` as Is
 
-class TextColorMatcher constructor(private val integerMatcher: Matcher<Int>) : BoundedMatcher<View, TextView>(TextView::class.java) {
+class TextColorMatcher(private val integerMatcher: Matcher<Int>) :
+    BoundedMatcher<View, TextView>(TextView::class.java) {
 
-    public override fun matchesSafely(textView: TextView): Boolean = integerMatcher.matches(textView.currentTextColor)
+    public override fun matchesSafely(textView: TextView): Boolean =
+        integerMatcher.matches(textView.currentTextColor)
 
     override fun describeMismatch(item: Any, mismatchDescription: Description) {
-        mismatchDescription.appendText("TextView with text color: " +
-            (item as TextView).currentTextColor + ", expected: ")
+        mismatchDescription.appendText(
+            "TextView with text color: " +
+                    (item as TextView).currentTextColor + ", expected: "
+        )
         integerMatcher.describeMismatch(item, mismatchDescription)
     }
 
diff --git a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleRouter.kt b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleRouter.kt
index c8c432607..9af84b90b 100644
--- a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleRouter.kt
+++ b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleRouter.kt
@@ -27,30 +27,53 @@ class DialogsExampleRouter(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize
-            object Default : Content()
+            data object Default : Content()
         }
 
         sealed class Overlay : Configuration() {
             @Parcelize
-            object ThemedDialog : Overlay()
+            data object ThemedDialog : Overlay()
 
             @Parcelize
-            object SimpleDialog : Overlay()
+            data object SimpleDialog : Overlay()
 
             @Parcelize
-            object LazyDialog : Overlay()
+            data object LazyDialog : Overlay()
 
             @Parcelize
-            object RibDialog : Overlay()
+            data object RibDialog : Overlay()
         }
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
         when (routing.configuration) {
             is Content.Default -> Resolution.noop()
-            is Overlay.ThemedDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.themedDialog)
-            is Overlay.SimpleDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.simpleDialog)
-            is Overlay.LazyDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.lazyDialog)
-            is Overlay.RibDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.ribDialog)
+            is Overlay.ThemedDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.themedDialog
+            )
+
+            is Overlay.SimpleDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.simpleDialog
+            )
+
+            is Overlay.LazyDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.lazyDialog
+            )
+
+            is Overlay.RibDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.ribDialog
+            )
         }
 }
diff --git a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleView.kt b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleView.kt
index 029b13414..48f98f9b4 100644
--- a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleView.kt
+++ b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dialogs_example/DialogsExampleView.kt
@@ -27,20 +27,26 @@ class DialogsExampleViewImpl private constructor(
     private val presenter: DialogsExamplePresenter
 ) : AndroidRibView(), DialogsExampleView {
 
-    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_dialogs) : DialogsExampleView.Factory {
-
-        override fun invoke(deps: DialogsExampleView.Dependency): ViewFactory<DialogsExampleView> = ViewFactory {
-            DialogsExampleViewImpl(
-                androidView = it.inflate(layoutRes),
-                presenter = deps.presenter
-            )
-        }
+    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_dialogs) :
+        DialogsExampleView.Factory {
+
+        override fun invoke(deps: DialogsExampleView.Dependency): ViewFactory<DialogsExampleView> =
+            ViewFactory {
+                DialogsExampleViewImpl(
+                    androidView = it.inflate(layoutRes),
+                    presenter = deps.presenter
+                )
+            }
     }
 
-    private val simpleDialogButton: Button = androidView.findViewById(R.id.dialogs_rib_simple_dialog_button)
-    private val themedDialogButton: Button = androidView.findViewById(R.id.dialogs_rib_themed_dialog_button)
-    private val ribDialogButton: Button = androidView.findViewById(R.id.dialogs_rib_rib_dialog_button)
-    private val lazyDialogButton: Button = androidView.findViewById(R.id.dialogs_rib_lazy_dialog_button)
+    private val simpleDialogButton: Button =
+        androidView.findViewById(R.id.dialogs_rib_simple_dialog_button)
+    private val themedDialogButton: Button =
+        androidView.findViewById(R.id.dialogs_rib_themed_dialog_button)
+    private val ribDialogButton: Button =
+        androidView.findViewById(R.id.dialogs_rib_rib_dialog_button)
+    private val lazyDialogButton: Button =
+        androidView.findViewById(R.id.dialogs_rib_lazy_dialog_button)
     private val text: TextView = androidView.findViewById(R.id.dialogs_rib_debug)
 
 
diff --git a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/Dummy.kt b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/Dummy.kt
index 8562f9246..d82d079d0 100644
--- a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/Dummy.kt
+++ b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/Dummy.kt
@@ -10,6 +10,6 @@ interface Dummy : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object SomeEvent : Output()
+        data object SomeEvent : Output()
     }
 }
diff --git a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/DummyView.kt b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/DummyView.kt
index bceb3288c..dac196d49 100644
--- a/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/DummyView.kt
+++ b/samples/elements/android-integration/dialogs/src/main/java/com/badoo/ribs/samples/android/dialogs/rib/dummy/DummyView.kt
@@ -15,7 +15,7 @@ import com.badoo.ribs.samples.android.dialogs.rib.dummy.DummyView.Event
 interface DummyView : RibView {
 
     sealed class Event {
-        object ButtonClicked : Event()
+        data object ButtonClicked : Event()
     }
 
     interface Dependency {
diff --git a/samples/elements/android-integration/launching-activities/src/androidTest/java/com/badoo/ribs/samples/android/launching_activities/rib/LaunchingActivitiesParentTest.kt b/samples/elements/android-integration/launching-activities/src/androidTest/java/com/badoo/ribs/samples/android/launching_activities/rib/LaunchingActivitiesParentTest.kt
index db64d18b7..8eb4d6db5 100644
--- a/samples/elements/android-integration/launching-activities/src/androidTest/java/com/badoo/ribs/samples/android/launching_activities/rib/LaunchingActivitiesParentTest.kt
+++ b/samples/elements/android-integration/launching-activities/src/androidTest/java/com/badoo/ribs/samples/android/launching_activities/rib/LaunchingActivitiesParentTest.kt
@@ -34,12 +34,20 @@ class LaunchingActivitiesParentTest {
 
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         LaunchingActivitiesChild1Builder(object : LaunchingActivitiesChildBase.Dependency {
-            override val activityStarter: ActivityStarter = ribTestActivity.integrationPoint.activityStarter
+            override val activityStarter: ActivityStarter =
+                ribTestActivity.integrationPoint.activityStarter
         }).build(BuildContext.root(savedInstanceState))
 
     @Test
     fun whenLaunchActivityButtonIsPressedThenOtherActivityIsStarted() {
         onView(ViewMatchers.withId(R.id.launchActivityButton)).perform(click())
-        intended(hasComponent(ComponentName(InstrumentationRegistry.getInstrumentation().context, OtherActivity::class.java)))
+        intended(
+            hasComponent(
+                ComponentName(
+                    InstrumentationRegistry.getInstrumentation().context,
+                    OtherActivity::class.java
+                )
+            )
+        )
     }
 }
diff --git a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildInteractor.kt b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildInteractor.kt
index 685181c6e..9f567db2d 100644
--- a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildInteractor.kt
+++ b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildInteractor.kt
@@ -49,8 +49,10 @@ class LaunchingActivitiesChildInteractor(
     private fun onActivityEvent(activityEvent: ActivityStarter.ActivityResultEvent) {
         if (activityEvent.requestCode == REQUEST_CODE_OTHER_ACTIVITY) {
             if (activityEvent.resultCode == Activity.RESULT_OK) {
-                dataReturnedRelay.accept(activityEvent.data?.getStringExtra(OtherActivity.KEY_OUTGOING)
-                    ?: "")
+                dataReturnedRelay.accept(
+                    activityEvent.data?.getStringExtra(OtherActivity.KEY_OUTGOING)
+                        ?: ""
+                )
             }
         }
     }
diff --git a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildView.kt b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildView.kt
index f0a168498..47e460356 100644
--- a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildView.kt
+++ b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/child_common/LaunchingActivitiesChildView.kt
@@ -36,7 +36,7 @@ interface LaunchingActivitiesChildView : RibView {
     }
 }
 
-class LaunchingActivitiesChildViewImpl constructor(
+class LaunchingActivitiesChildViewImpl(
     override val androidView: ViewGroup,
     val dependency: LaunchingActivitiesChildView.Dependency
 ) : AndroidRibView(), LaunchingActivitiesChildView, Source<LaunchingActivitiesChildView.Event> {
@@ -56,7 +56,8 @@ class LaunchingActivitiesChildViewImpl constructor(
         launchButton.setOnClickListener {
             _events.accept(
                 LaunchingActivitiesChildView.Event.LaunchActivityForResult(
-                    "Launched from `${title.text}`")
+                    "Launched from `${title.text}`"
+                )
             )
         }
     }
diff --git a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleBuilder.kt b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleBuilder.kt
index 0f1ca5495..b9d7d3bd4 100644
--- a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleBuilder.kt
+++ b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleBuilder.kt
@@ -14,7 +14,8 @@ class LaunchingActivitiesExampleBuilder(
     override fun build(buildParams: BuildParams<Nothing?>): LaunchingActivitiesExample {
         val router = LaunchingActivitiesExampleRouter(
             buildParams = buildParams,
-            builders = LaunchingActivitiesExampleChildBuilders(object : LaunchingActivitiesChildBase.Dependency {
+            builders = LaunchingActivitiesExampleChildBuilders(object :
+                LaunchingActivitiesChildBase.Dependency {
                 override val activityStarter: ActivityStarter = dependency.activityStarter
             }),
         )
diff --git a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleView.kt b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleView.kt
index f2193547d..20e1b9028 100644
--- a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleView.kt
+++ b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/LaunchingActivitiesExampleView.kt
@@ -27,7 +27,7 @@ interface LaunchingActivitiesExampleView : RibView {
     interface Factory : ViewFactoryBuilder<Dependency, LaunchingActivitiesExampleView>
 }
 
-class LaunchingActivitiesExampleViewImpl constructor(
+class LaunchingActivitiesExampleViewImpl(
     override val androidView: ViewGroup,
     val dependency: LaunchingActivitiesExampleView.Dependency
 ) : AndroidRibView(), LaunchingActivitiesExampleView {
diff --git a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/routing/LaunchingActivitiesExampleRouter.kt b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/routing/LaunchingActivitiesExampleRouter.kt
index 802685dfc..3b74b1a8e 100644
--- a/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/routing/LaunchingActivitiesExampleRouter.kt
+++ b/samples/elements/android-integration/launching-activities/src/main/java/com/badoo/ribs/samples/android/launching_activities/rib/launching_activities_example/routing/LaunchingActivitiesExampleRouter.kt
@@ -23,10 +23,10 @@ class LaunchingActivitiesExampleRouter(
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
             @Parcelize
-            object Child1 : Configuration()
+            data object Child1 : Configuration()
 
             @Parcelize
-            object Child2 : Configuration()
+            data object Child2 : Configuration()
         }
     }
 
diff --git a/samples/elements/android-integration/launching-activities/src/main/res/layout/activity_root.xml b/samples/elements/android-integration/launching-activities/src/main/res/layout/activity_root.xml
index 28c250f62..2c82ec8f4 100644
--- a/samples/elements/android-integration/launching-activities/src/main/res/layout/activity_root.xml
+++ b/samples/elements/android-integration/launching-activities/src/main/res/layout/activity_root.xml
@@ -4,6 +4,4 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.badoo.ribs.samples.android.launching_activities.app.RootActivity">
-
-</FrameLayout>
+    tools:context="com.badoo.ribs.samples.android.launching_activities.app.RootActivity" />
diff --git a/samples/elements/android-integration/launching-activities/src/main/res/layout/other_activity.xml b/samples/elements/android-integration/launching-activities/src/main/res/layout/other_activity.xml
index 0d0e0af59..ef8ac8b94 100644
--- a/samples/elements/android-integration/launching-activities/src/main/res/layout/other_activity.xml
+++ b/samples/elements/android-integration/launching-activities/src/main/res/layout/other_activity.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/dataReceivedLabel"
-        android:text="@string/label_data_received"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="@string/label_data_received"
+        app:layout_constraintBottom_toTopOf="@id/returnDataButton"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/returnDataButton"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
@@ -26,10 +26,10 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dataToReturnLayout"
         android:layout_width="match_parent"
-        android:layout_margin="16dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/dataReceivedLabel"
-        app:layout_constraintBottom_toTopOf="@+id/returnDataButton">
+        android:layout_margin="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/returnDataButton"
+        app:layout_constraintTop_toBottomOf="@id/dataReceivedLabel">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/dataToReturn"
@@ -40,13 +40,13 @@
 
     <Button
         android:id="@+id/returnDataButton"
-        android:text="@string/button_return_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/dataReceivedLabel"
+        android:text="@string/button_return_data"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dataReceivedLabel"
 
         />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1Presenter.kt b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1Presenter.kt
index 8ce8dbb89..510d597ee 100644
--- a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1Presenter.kt
+++ b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1Presenter.kt
@@ -22,7 +22,8 @@ interface PermissionsSampleChild1Presenter : RequestCodeClient {
 class PermissionsSampleChild1PresenterImpl(
     private val permissionRequester: PermissionRequester,
     private val ribAware: RibAware<PermissionsSampleChild1> = RibAwareImpl()
-) : PermissionsSampleChild1Presenter, ViewAware<PermissionsSampleChild1View>, RibAware<PermissionsSampleChild1> by ribAware {
+) : PermissionsSampleChild1Presenter, ViewAware<PermissionsSampleChild1View>,
+    RibAware<PermissionsSampleChild1> by ribAware {
 
     private var view: PermissionsSampleChild1View? = null
     private var cancellable: Cancellable? = null
diff --git a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1View.kt b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1View.kt
index 2dff59368..413025e34 100644
--- a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1View.kt
+++ b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child1/PermissionsSampleChild1View.kt
@@ -27,16 +27,19 @@ class PermissionsSampleChild1ViewImpl private constructor(
     private val presenter: PermissionsSampleChild1Presenter
 ) : AndroidRibView(), PermissionsSampleChild1View {
 
-    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_permissions_sample) : PermissionsSampleChild1View.Factory {
-        override fun invoke(deps: PermissionsSampleChild1View.Dependency): ViewFactory<PermissionsSampleChild1View> = ViewFactory {
-            PermissionsSampleChild1ViewImpl(
-                androidView = it.inflate(layoutRes),
-                presenter = deps.presenter
-            )
-        }
+    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_permissions_sample) :
+        PermissionsSampleChild1View.Factory {
+        override fun invoke(deps: PermissionsSampleChild1View.Dependency): ViewFactory<PermissionsSampleChild1View> =
+            ViewFactory {
+                PermissionsSampleChild1ViewImpl(
+                    androidView = it.inflate(layoutRes),
+                    presenter = deps.presenter
+                )
+            }
     }
 
-    private val availablePermissionsTextView: TextView = androidView.findViewById(R.id.availablePermissions_text)
+    private val availablePermissionsTextView: TextView =
+        androidView.findViewById(R.id.availablePermissions_text)
     private val checkButton: Button = androidView.findViewById(R.id.check_permissions_button)
     private val requestButton: Button = androidView.findViewById(R.id.request_permissions_button)
 
diff --git a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2Presenter.kt b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2Presenter.kt
index 04435f178..8b378232d 100644
--- a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2Presenter.kt
+++ b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2Presenter.kt
@@ -22,7 +22,8 @@ interface PermissionsSampleChild2Presenter : RequestCodeClient {
 class PermissionsSampleChild2PresenterImpl(
     private val permissionRequester: PermissionRequester,
     private val ribAware: RibAware<PermissionsSampleChild2> = RibAwareImpl()
-) : PermissionsSampleChild2Presenter, ViewAware<PermissionsSampleChild2ViewImpl>, RibAware<PermissionsSampleChild2> by ribAware {
+) : PermissionsSampleChild2Presenter, ViewAware<PermissionsSampleChild2ViewImpl>,
+    RibAware<PermissionsSampleChild2> by ribAware {
 
     private var view: PermissionsSampleChild2ViewImpl? = null
     private var cancellable: Cancellable? = null
diff --git a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2ViewImpl.kt b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2ViewImpl.kt
index 42c66fa6c..2f2e7e861 100644
--- a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2ViewImpl.kt
+++ b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/child2/PermissionsSampleChild2ViewImpl.kt
@@ -27,16 +27,19 @@ class PermissionsSampleChild2ViewImpl private constructor(
     private val presenter: PermissionsSampleChild2Presenter
 ) : AndroidRibView(), PermissionsSampleChild2View {
 
-    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_permissions_sample) : PermissionsSampleChild2View.Factory {
-        override fun invoke(deps: PermissionsSampleChild2View.Dependency): ViewFactory<PermissionsSampleChild2ViewImpl> = ViewFactory {
-            PermissionsSampleChild2ViewImpl(
-                androidView = it.inflate(layoutRes),
-                presenter = deps.presenter
-            )
-        }
+    class Factory(@LayoutRes private val layoutRes: Int = R.layout.rib_permissions_sample) :
+        PermissionsSampleChild2View.Factory {
+        override fun invoke(deps: PermissionsSampleChild2View.Dependency): ViewFactory<PermissionsSampleChild2ViewImpl> =
+            ViewFactory {
+                PermissionsSampleChild2ViewImpl(
+                    androidView = it.inflate(layoutRes),
+                    presenter = deps.presenter
+                )
+            }
     }
 
-    private val availablePermissionsTextView: TextView = androidView.findViewById(R.id.availablePermissions_text)
+    private val availablePermissionsTextView: TextView =
+        androidView.findViewById(R.id.availablePermissions_text)
     private val checkButton: Button = androidView.findViewById(R.id.check_permissions_button)
     private val requestButton: Button = androidView.findViewById(R.id.request_permissions_button)
 
diff --git a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/parent/routing/PermissionsExampleRouter.kt b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/parent/routing/PermissionsExampleRouter.kt
index 5ae6ca32e..cf60ca5a3 100644
--- a/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/parent/routing/PermissionsExampleRouter.kt
+++ b/samples/elements/android-integration/permissions/src/main/java/com/badoo/ribs/samples/android/permissions/rib/parent/routing/PermissionsExampleRouter.kt
@@ -22,10 +22,10 @@ class PermissionsExampleRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
             @Parcelize
-            object Child1 : Permanent()
+            data object Child1 : Permanent()
 
             @Parcelize
-            object Child2 : Permanent()
+            data object Child2 : Permanent()
         }
     }
 
diff --git a/samples/elements/android-integration/permissions/src/main/res/layout/rib_permissions_sample.xml b/samples/elements/android-integration/permissions/src/main/res/layout/rib_permissions_sample.xml
index 629a88325..3c234a5a5 100644
--- a/samples/elements/android-integration/permissions/src/main/res/layout/rib_permissions_sample.xml
+++ b/samples/elements/android-integration/permissions/src/main/res/layout/rib_permissions_sample.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_foobar"
-    android:background="@color/light_gray2"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/light_gray2"
     tools:context=".app.PermissionsSampleActivity">
 
     <TextView
diff --git a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting/GreetingView.kt b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting/GreetingView.kt
index 87d5db1b2..91088b307 100644
--- a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting/GreetingView.kt
+++ b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting/GreetingView.kt
@@ -36,12 +36,13 @@ class GreetingViewImpl private constructor(
     class Factory(
         @LayoutRes private val layoutRes: Int = R.layout.rib_greeting
     ) : GreetingView.Factory {
-        override fun invoke(deps: GreetingView.Dependency): ViewFactory<GreetingView> = object : ViewFactory<GreetingView> {
-            override fun invoke(context: ViewFactory.Context) = GreetingViewImpl(
-                context.inflate(layoutRes),
-                presenter = deps.presenter
-            )
-        }
+        override fun invoke(deps: GreetingView.Dependency): ViewFactory<GreetingView> =
+            ViewFactory { context ->
+                GreetingViewImpl(
+                    context.inflate(layoutRes),
+                    presenter = deps.presenter
+                )
+            }
     }
 
     private val greetingTextView: TextView = androidView.findViewById(R.id.greeting_text)
diff --git a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerInteractor.kt b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerInteractor.kt
index 2c1fef0fd..93ae55909 100644
--- a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerInteractor.kt
+++ b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerInteractor.kt
@@ -42,11 +42,12 @@ internal class GreetingContainerInteractor(
         }
     }
 
-    private val languageSelectorOutputToGreetingInput: (LanguageSelector.Output) -> Greeting.Input = {
-        when (it) {
-            is LanguageSelector.Output.LanguageSelected -> Greeting.Input.UpdateGreeting(it.selectedIndex)
+    private val languageSelectorOutputToGreetingInput: (LanguageSelector.Output) -> Greeting.Input =
+        {
+            when (it) {
+                is LanguageSelector.Output.LanguageSelected -> Greeting.Input.UpdateGreeting(it.selectedIndex)
+            }
         }
-    }
 
     private fun onLanguageSelectorOutput(output: LanguageSelector.Output) {
         when (output) {
diff --git a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerView.kt b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerView.kt
index 9c3cf470f..f90e5d9f2 100644
--- a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerView.kt
+++ b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/GreetingContainerView.kt
@@ -18,10 +18,11 @@ class GreetingContainerViewImpl private constructor(
     GreetingContainerView {
 
     class Factory : GreetingContainerView.Factory {
-        override fun invoke(deps: Nothing?): ViewFactory<GreetingContainerView> = ViewFactory { context ->
-            GreetingContainerViewImpl(
-                FrameLayout(context.parent.context)
-            )
-        }
+        override fun invoke(deps: Nothing?): ViewFactory<GreetingContainerView> =
+            ViewFactory { context ->
+                GreetingContainerViewImpl(
+                    FrameLayout(context.parent.context)
+                )
+            }
     }
 }
diff --git a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/routing/GreetingContainerRouter.kt b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/routing/GreetingContainerRouter.kt
index 1ef26dbbb..62f8c7281 100644
--- a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/routing/GreetingContainerRouter.kt
+++ b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/greeting_container/routing/GreetingContainerRouter.kt
@@ -24,7 +24,7 @@ internal class GreetingContainerRouter(
 ) {
     sealed class Configuration : Parcelable {
         @Parcelize
-        object Greeting : Configuration()
+        data object Greeting : Configuration()
 
         @Parcelize
         data class ChooseLanguage(val currentLanguage: Language) : Configuration()
@@ -34,7 +34,12 @@ internal class GreetingContainerRouter(
         with(childBuilder) {
             when (val configuration = routing.configuration) {
                 is Greeting -> child { greetingBuilder.build(it) }
-                is ChooseLanguage -> child { languageSelectorBuilder.build(it, Params(configuration.currentLanguage)) }
+                is ChooseLanguage -> child {
+                    languageSelectorBuilder.build(
+                        it,
+                        Params(configuration.currentLanguage)
+                    )
+                }
             }
         }
 }
diff --git a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/language_selector/LanguageSelectorView.kt b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/language_selector/LanguageSelectorView.kt
index 4ec42ec0b..1037c8daf 100644
--- a/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/language_selector/LanguageSelectorView.kt
+++ b/samples/elements/communication/coordinate-multiple/src/main/java/com/badoo/ribs/samples/communication/coordinate_multiple_example/rib/language_selector/LanguageSelectorView.kt
@@ -49,7 +49,8 @@ class LanguageSelectorViewImpl private constructor(
             }
     }
 
-    private val confirmLanguageButton: Button = androidView.findViewById(R.id.confirm_language_button)
+    private val confirmLanguageButton: Button =
+        androidView.findViewById(R.id.confirm_language_button)
     private val radioGroup: RadioGroup = androidView.findViewById(R.id.languages_radio_group)
 
     init {
diff --git a/samples/elements/communication/menu-example/build.gradle b/samples/elements/communication/menu-example/build.gradle
index be31453e8..3e23f8e76 100644
--- a/samples/elements/communication/menu-example/build.gradle
+++ b/samples/elements/communication/menu-example/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':libraries:rib-base')
     implementation project(':samples:resources')
 
-    implementation deps.external.rxrelay2
+    implementation deps.external.rxrelay3
 
     junitTestImplementation(project)
     testImplementation deps.external.roboelectricBase
diff --git a/samples/elements/communication/menu-example/src/androidTest/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExampleTest.kt b/samples/elements/communication/menu-example/src/androidTest/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExampleTest.kt
index 260b143e8..b1ace2cd7 100644
--- a/samples/elements/communication/menu-example/src/androidTest/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExampleTest.kt
+++ b/samples/elements/communication/menu-example/src/androidTest/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExampleTest.kt
@@ -6,7 +6,9 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.badoo.ribs.core.modality.BuildContext
 import com.badoo.ribs.samples.communication.menu_example.R
 import com.badoo.ribs.test.RibsRule
@@ -45,7 +47,7 @@ class MenuExampleTest {
         whenever { iNavigateToChild1() }
         then { iSeeChild1() }
     }
-    
+
     // region Helper functions
 
     private fun iNavigateToChild1() {
@@ -84,10 +86,21 @@ class MenuExampleTest {
         pressBack()
     }
 
-    private fun given(step: () -> Unit) { step() }
-    private fun whenever(step: () -> Unit) { step() }
-    private fun then(step: () -> Unit) { step() }
-    private fun and(step: () -> Unit) { step() }
+    private fun given(step: () -> Unit) {
+        step()
+    }
+
+    private fun whenever(step: () -> Unit) {
+        step()
+    }
+
+    private fun then(step: () -> Unit) {
+        step()
+    }
+
+    private fun and(step: () -> Unit) {
+        step()
+    }
 
     // endregion
 }
diff --git a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/Menu.kt b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/Menu.kt
index c13acfa3b..f02324c38 100644
--- a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/Menu.kt
+++ b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/Menu.kt
@@ -20,8 +20,13 @@ interface Menu : Rib, Connectable<Input, Output> {
     }
 
     sealed class MenuItem : Parcelable {
-        @Parcelize object Child1 : MenuItem()
-        @Parcelize object Child2 : MenuItem()
-        @Parcelize object Child3 : MenuItem()
+        @Parcelize
+        data object Child1 : MenuItem()
+
+        @Parcelize
+        data object Child2 : MenuItem()
+
+        @Parcelize
+        data object Child3 : MenuItem()
     }
 }
diff --git a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/MenuView.kt b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/MenuView.kt
index 0f518b791..c55f3f2a8 100644
--- a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/MenuView.kt
+++ b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu/MenuView.kt
@@ -56,7 +56,7 @@ class MenuViewImpl private constructor(
             it.setTextColor(ContextCompat.getColor(androidView.context, R.color.text_default))
         }
 
-        when(item) {
+        when (item) {
             Menu.MenuItem.Child1 -> child1
             Menu.MenuItem.Child2 -> child2
             Menu.MenuItem.Child3 -> child3
diff --git a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExamplePresenter.kt b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExamplePresenter.kt
index 2b7195e36..742137bc4 100644
--- a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExamplePresenter.kt
+++ b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/MenuExamplePresenter.kt
@@ -4,9 +4,9 @@ import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.plugin.SubtreeChangeAware
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.replace
+import com.badoo.ribs.samples.communication.menu_example.rib.menu.Menu
 import com.badoo.ribs.samples.communication.menu_example.rib.menu_example.routing.MenuExampleRouter.Configuration
 import com.badoo.ribs.samples.communication.menu_example.rib.menu_example.routing.MenuExampleRouter.Configuration.Content
-import com.badoo.ribs.samples.communication.menu_example.rib.menu.Menu
 
 interface MenuExamplePresenter
 
diff --git a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleChildBuilders.kt b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleChildBuilders.kt
index 19dcb3806..6c377ceb2 100644
--- a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleChildBuilders.kt
+++ b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleChildBuilders.kt
@@ -6,9 +6,9 @@ import com.badoo.ribs.samples.communication.menu_example.rib.child2.Child2
 import com.badoo.ribs.samples.communication.menu_example.rib.child2.Child2Builder
 import com.badoo.ribs.samples.communication.menu_example.rib.child3.Child3
 import com.badoo.ribs.samples.communication.menu_example.rib.child3.Child3Builder
-import com.badoo.ribs.samples.communication.menu_example.rib.menu_example.MenuExample
 import com.badoo.ribs.samples.communication.menu_example.rib.menu.Menu
 import com.badoo.ribs.samples.communication.menu_example.rib.menu.MenuBuilder
+import com.badoo.ribs.samples.communication.menu_example.rib.menu_example.MenuExample
 
 internal class MenuExampleChildBuilders(
     dependency: MenuExample.Dependency
diff --git a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleRouter.kt b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleRouter.kt
index 899de19fc..733093ee5 100644
--- a/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleRouter.kt
+++ b/samples/elements/communication/menu-example/src/main/java/com/badoo/ribs/samples/communication/menu_example/rib/menu_example/routing/MenuExampleRouter.kt
@@ -25,13 +25,19 @@ class MenuExampleRouter internal constructor(
 ) {
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
-            @Parcelize object Menu : Permanent()
+            @Parcelize
+            data object Menu : Permanent()
         }
 
         sealed class Content : Configuration() {
-            @Parcelize object Child1 : Content()
-            @Parcelize object Child2 : Content()
-            @Parcelize object Child3 : Content()
+            @Parcelize
+            data object Child1 : Content()
+
+            @Parcelize
+            data object Child2 : Content()
+
+            @Parcelize
+            data object Child3 : Content()
         }
     }
 
diff --git a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterBuilder.kt b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterBuilder.kt
index 191eac5b7..c0187d47d 100644
--- a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterBuilder.kt
+++ b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterBuilder.kt
@@ -6,13 +6,12 @@ import com.badoo.ribs.samples.retained_instance_store.utils.SecondsClock
 import com.badoo.ribs.store.RetainedInstanceStore
 import com.badoo.ribs.store.get
 
-
 class CounterBuilder : SimpleBuilder<Counter>() {
 
     override fun build(buildParams: BuildParams<Nothing?>): Counter {
 
         val clock1 = SecondsClock()
-        val clock2 =  RetainedInstanceStore.get(
+        val clock2 = RetainedInstanceStore.get(
             owner = buildParams.identifier,
             factory = { SecondsClock() },
             disposer = { it.dispose() }
@@ -20,7 +19,8 @@ class CounterBuilder : SimpleBuilder<Counter>() {
 
         val presenter = CounterPresenterImpl(
             clock1 = clock1,
-            clock2 = clock2)
+            clock2 = clock2
+        )
 
         return CounterNode(
             buildParams = buildParams,
diff --git a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterView.kt b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterView.kt
index 530f50115..7019dbf1f 100644
--- a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterView.kt
+++ b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/counter/CounterView.kt
@@ -20,7 +20,8 @@ interface CounterView : RibView {
 
 }
 
-class CounterViewImpl private constructor(override val androidView: ViewGroup) : AndroidRibView(), CounterView {
+class CounterViewImpl private constructor(override val androidView: ViewGroup) : AndroidRibView(),
+    CounterView {
 
     class Factory(
         @LayoutRes private val layoutRes: Int = R.layout.rib_counter
diff --git a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleRouter.kt b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleRouter.kt
index ebfd50bea..3c7ee4dec 100644
--- a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleRouter.kt
+++ b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleRouter.kt
@@ -24,10 +24,10 @@ class RetainedInstanceExampleRouter internal constructor(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize
-            object Default : Configuration()
+            data object Default : Configuration()
 
             @Parcelize
-            object Counter : Configuration()
+            data object Counter : Configuration()
         }
     }
 
diff --git a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleView.kt b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleView.kt
index 87f6c2bb8..d6efe76e9 100644
--- a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleView.kt
+++ b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/rib/retained_instance_example/RetainedInstanceExampleView.kt
@@ -12,7 +12,8 @@ import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.samples.retained_instance_store.R
-import com.badoo.ribs.samples.retained_instance_store.rib.retained_instance_example.RetainedInstanceExampleView.*
+import com.badoo.ribs.samples.retained_instance_store.rib.retained_instance_example.RetainedInstanceExampleView.ButtonState
+import com.badoo.ribs.samples.retained_instance_store.rib.retained_instance_example.RetainedInstanceExampleView.Dependency
 
 interface RetainedInstanceExampleView : RibView {
 
@@ -23,8 +24,8 @@ interface RetainedInstanceExampleView : RibView {
     }
 
     sealed class ButtonState(val resId: Int) {
-        object CreateCounter : ButtonState(R.string.create_button_text)
-        object DestroyCounter : ButtonState(R.string.destroy_button_text)
+        data object CreateCounter : ButtonState(R.string.create_button_text)
+        data object DestroyCounter : ButtonState(R.string.destroy_button_text)
     }
 
     fun updateButtonState(state: ButtonState)
diff --git a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/utils/Clock.kt b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/utils/Clock.kt
index d6e31583d..ea287b4d0 100644
--- a/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/utils/Clock.kt
+++ b/samples/elements/other/retained-instance-store/src/main/java/com/badoo/ribs/samples/retained_instance_store/utils/Clock.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.samples.retained_instance_store.utils
 
 import android.os.Handler
 import android.os.Looper
-import java.util.*
+import java.util.Timer
 import kotlin.concurrent.fixedRateTimer
 
 private const val PERIOD_MS = 1000L
diff --git a/samples/elements/other/retained-instance-store/src/main/res/layout-land/rib_retained_instance.xml b/samples/elements/other/retained-instance-store/src/main/res/layout-land/rib_retained_instance.xml
index 6d9e75f58..a0f85724a 100644
--- a/samples/elements/other/retained-instance-store/src/main/res/layout-land/rib_retained_instance.xml
+++ b/samples/elements/other/retained-instance-store/src/main/res/layout-land/rib_retained_instance.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <TextView
         android:id="@+id/description_text"
         android:layout_width="0dp"
@@ -46,9 +45,9 @@
 
     <Button
         android:id="@+id/toggle_child_button"
-        android:layout_marginEnd="8dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:backgroundTint="@color/colorPrimary"
         android:textColor="@android:color/white"
         app:layout_constraintBottom_toBottomOf="@+id/children_container"
@@ -71,7 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/placeholder_text"
-            android:textColor="@android:color/black"/>
+            android:textColor="@android:color/black" />
 
     </FrameLayout>
 
diff --git a/samples/elements/other/retained-instance-store/src/main/res/layout/rib_counter.xml b/samples/elements/other/retained-instance-store/src/main/res/layout/rib_counter.xml
index be5dc297b..6f16e422a 100644
--- a/samples/elements/other/retained-instance-store/src/main/res/layout/rib_counter.xml
+++ b/samples/elements/other/retained-instance-store/src/main/res/layout/rib_counter.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     android:background="@color/colorPrimaryPale">
 
-
     <TextView
         android:id="@+id/retained_description_text"
         android:layout_width="0dp"
diff --git a/samples/elements/other/retained-instance-store/src/main/res/layout/rib_retained_instance.xml b/samples/elements/other/retained-instance-store/src/main/res/layout/rib_retained_instance.xml
index e7f138b48..9e3e69672 100644
--- a/samples/elements/other/retained-instance-store/src/main/res/layout/rib_retained_instance.xml
+++ b/samples/elements/other/retained-instance-store/src/main/res/layout/rib_retained_instance.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -43,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/placeholder_text"
-            android:textColor="@android:color/black"/>
+            android:textColor="@android:color/black" />
 
     </FrameLayout>
 
@@ -61,8 +60,8 @@
     <TextView
         android:id="@+id/demo_step_2"
         android:layout_width="0dp"
-        android:layout_marginEnd="8dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:text="@string/demo_step_2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/demo_step_1"
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index f411216ff..f37325cb8 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -58,8 +58,8 @@ dependencies {
     implementation deps.external.mviCore
     implementation deps.external.mviCoreAndroid
     implementation deps.external.mviCoreBinder
-    implementation deps.external.rxrelay2
-    implementation deps.external.rxandroid2
+    implementation deps.external.rxrelay3
+    implementation deps.external.rxandroid3
     implementation deps.external.leakCanary // use debugImplementation in real life apps
 
     implementation platform(deps.compose.bom)
@@ -75,15 +75,15 @@ dependencies {
     implementation project(":libraries:rib-compose")
     implementation project(":libraries:rib-debug-utils")
     implementation project(":libraries:rib-mvicore")
-    implementation project(':libraries:rib-portal-rx2')
-    implementation project(':libraries:rib-rx2')
+    implementation project(':libraries:rib-portal-rx3')
+    implementation project(':libraries:rib-rx3')
 
     junitTestImplementation(project)
     testImplementation deps.external.roboelectricBase
     testImplementation deps.test.mockitoKotlin
     testImplementation deps.test.assertj
     testImplementation project(":libraries:rib-base-test")
-    testImplementation project(":libraries:rib-base-test-rx2")
+    testImplementation project(':libraries:rib-base-test-rx3')
 
     junitAndroidTestImplementation(project)
     androidTestImplementation platform(deps.compose.bom)
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/app/CompiledWorkflowTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/app/CompiledWorkflowTest.kt
index ce6923b19..d6c603051 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/app/CompiledWorkflowTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/app/CompiledWorkflowTest.kt
@@ -3,8 +3,8 @@ package com.badoo.ribs.sandbox.app
 import android.content.Intent
 import android.net.Uri
 import androidx.test.rule.ActivityTestRule
-import io.reactivex.Observable
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.Rule
 import org.junit.Test
 
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/matcher/TextColorMatcher.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/matcher/TextColorMatcher.kt
index 186ddac6f..5cd86e353 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/matcher/TextColorMatcher.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/matcher/TextColorMatcher.kt
@@ -1,21 +1,25 @@
 package com.badoo.ribs.sandbox.matcher
 
+import android.view.View
+import android.widget.TextView
 import androidx.annotation.ColorRes
 import androidx.test.InstrumentationRegistry
 import androidx.test.espresso.matcher.BoundedMatcher
-import android.view.View
-import android.widget.TextView
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.core.Is.`is` as Is
 
-class TextColorMatcher constructor(private val integerMatcher: Matcher<Int>) : BoundedMatcher<View, TextView>(TextView::class.java) {
+class TextColorMatcher(private val integerMatcher: Matcher<Int>) :
+    BoundedMatcher<View, TextView>(TextView::class.java) {
 
-    public override fun matchesSafely(textView: TextView): Boolean = integerMatcher.matches(textView.currentTextColor)
+    public override fun matchesSafely(textView: TextView): Boolean =
+        integerMatcher.matches(textView.currentTextColor)
 
     override fun describeMismatch(item: Any, mismatchDescription: Description) {
-        mismatchDescription.appendText("TextView with text color: " +
-            (item as TextView).currentTextColor + ", expected: ")
+        mismatchDescription.appendText(
+            "TextView with text color: " +
+                    (item as TextView).currentTextColor + ", expected: "
+        )
         integerMatcher.describeMismatch(item, mismatchDescription)
     }
 
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleTest.kt
index 58dff93a1..f99b13496 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleTest.kt
@@ -8,20 +8,20 @@ import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.android.dialog.DialogLauncher
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.matcher.withTextColor
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
 import org.junit.Rule
 import org.junit.Test
 
-
 class DialogExampleTest {
 
     @get:Rule
-    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
+    val ribsRule =
+        RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
 
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         DialogExampleBuilder(object : DialogExample.Dependency {
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTest.kt
index 9d2fac657..6816d6cb3 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTest.kt
@@ -5,24 +5,26 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.android.activitystarter.ActivityStarter
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.portal.Portal
 import com.badoo.ribs.sandbox.R
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
 import org.junit.Rule
 import org.junit.Test
 
 class HelloWorldTest {
 
     @get:Rule
-    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
+    val ribsRule =
+        RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
 
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         HelloWorldBuilder(object : HelloWorld.Dependency {
             override val portal: Portal.OtherSide = Portal.OtherSide.NOOP
-            override val activityStarter: ActivityStarter = ribTestActivity.integrationPoint.activityStarter
+            override val activityStarter: ActivityStarter =
+                ribTestActivity.integrationPoint.activityStarter
         }).build(root(savedInstanceState))
 
     @Test
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTestDeferred.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTestDeferred.kt
index 191102341..f983f1177 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTestDeferred.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldTestDeferred.kt
@@ -5,12 +5,12 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.android.activitystarter.ActivityStarter
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.portal.Portal
 import com.badoo.ribs.sandbox.R
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
 import org.junit.Rule
 import org.junit.Test
 
@@ -22,7 +22,8 @@ class HelloWorldTestDeferred {
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         HelloWorldBuilder(object : HelloWorld.Dependency {
             override val portal: Portal.OtherSide = Portal.OtherSide.NOOP
-            override val activityStarter: ActivityStarter = ribTestActivity.integrationPoint.activityStarter
+            override val activityStarter: ActivityStarter =
+                ribTestActivity.integrationPoint.activityStarter
         }).build(root(savedInstanceState))
 
     @Test
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumTest.kt
index 28417f527..683af33e5 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumTest.kt
@@ -5,23 +5,24 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.sandbox.R
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
 import org.junit.Rule
 import org.junit.Test
 
 class LoremIpsumTest {
 
     @get:Rule
-    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
+    val ribsRule =
+        RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
 
     private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
         LoremIpsumBuilder(object : LoremIpsum.Dependency {}).build(root(savedInstanceState))
 
     @Test
     fun testTextDisplayed() {
-         onView(withId(R.id.lorem_ipsum_text)).check(matches(isDisplayed()))
+        onView(withId(R.id.lorem_ipsum_text)).check(matches(isDisplayed()))
     }
 }
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuTest.kt
index 812159199..8b582e564 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuTest.kt
@@ -2,15 +2,15 @@ package com.badoo.ribs.sandbox.rib.menu
 
 import android.os.Bundle
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
-import com.badoo.ribs.test.RibsRule
-import com.badoo.ribs.test.RibTestActivity
 import com.badoo.ribs.core.modality.BuildContext.Companion.root
 import com.badoo.ribs.sandbox.rib.menu.Menu.Input.SelectMenuItem
 import com.badoo.ribs.sandbox.rib.menu.Menu.MenuItem.FooBar
 import com.badoo.ribs.sandbox.rib.menu.Menu.MenuItem.HelloWorld
 import com.badoo.ribs.sandbox.rib.menu.element.MenuElement
-import io.reactivex.Observable
-import io.reactivex.observers.TestObserver
+import com.badoo.ribs.test.RibTestActivity
+import com.badoo.ribs.test.RibsRule
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.Rule
 import org.junit.Test
 
@@ -75,7 +75,7 @@ class MenuTest {
             rib = it
         }
 
-    private fun <T> Observable<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
+    private fun <T : Any> Observable<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
         subscribe(this)
     }
 }
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuViewTest.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuViewTest.kt
index dfd5f6232..e9209172c 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuViewTest.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/MenuViewTest.kt
@@ -5,8 +5,8 @@ import com.badoo.ribs.sandbox.rib.menu.Menu.MenuItem.FooBar
 import com.badoo.ribs.sandbox.rib.menu.Menu.MenuItem.HelloWorld
 import com.badoo.ribs.sandbox.rib.menu.element.MenuElement
 import com.badoo.ribs.test.view.RibsViewRule
-import io.reactivex.ObservableSource
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.observers.TestObserver
 import org.junit.Rule
 import org.junit.Test
 
@@ -70,7 +70,7 @@ class MenuViewTest {
         menu.fooItem.assertIsSelected()
     }
 
-    private fun <T> ObservableSource<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
+    private fun <T : Any> ObservableSource<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
         subscribe(this)
     }
 }
diff --git a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/element/MenuItemElement.kt b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/element/MenuItemElement.kt
index 3ce719491..e5a94ea24 100644
--- a/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/element/MenuItemElement.kt
+++ b/sandbox/src/androidTest/java/com/badoo/ribs/sandbox/rib/menu/element/MenuItemElement.kt
@@ -5,8 +5,8 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.badoo.ribs.sandbox.matcher.withTextColor
 import com.badoo.ribs.sandbox.R
+import com.badoo.ribs.sandbox.matcher.withTextColor
 
 class MenuItemElement(@IdRes id: Int) {
     private val matcher = withId(id)
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/app/OtherActivity.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/app/OtherActivity.kt
index e1016c0bd..f66a4e6a8 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/app/OtherActivity.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/app/OtherActivity.kt
@@ -4,8 +4,8 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.app.AppCompatActivity
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import com.badoo.ribs.sandbox.R
 
 class OtherActivity : AppCompatActivity() {
@@ -25,7 +25,9 @@ class OtherActivity : AppCompatActivity() {
         findViewById<TextView>(R.id.incoming_data).text = intent.extras?.getString(KEY_INCOMING)
 
         findViewById<View>(R.id.fab).setOnClickListener {
-            setResult(Activity.RESULT_OK, Intent().apply { putExtra(KEY_RETURNED_DATA, RETURNED_DATA) })
+            setResult(
+                Activity.RESULT_OK,
+                Intent().apply { putExtra(KEY_RETURNED_DATA, RETURNED_DATA) })
             finish()
         }
     }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/app/RootActivity.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/app/RootActivity.kt
index 7d16fc47c..0e0a2ff82 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/app/RootActivity.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/app/RootActivity.kt
@@ -17,24 +17,22 @@ import com.badoo.ribs.core.plugin.utils.memoryleak.LeakDetector
 import com.badoo.ribs.debug.TreePrinter
 import com.badoo.ribs.portal.Portal
 import com.badoo.ribs.portal.PortalRouter
-import com.badoo.ribs.portal.rx2.Rx2Portal
-import com.badoo.ribs.portal.rx2.Rx2PortalBuilder
+import com.badoo.ribs.portal.rx3.Rx3Portal
+import com.badoo.ribs.portal.rx3.Rx3PortalBuilder
 import com.badoo.ribs.routing.resolution.ChildResolution.Companion.child
 import com.badoo.ribs.routing.resolution.Resolution
 import com.badoo.ribs.routing.transition.handler.CrossFader
 import com.badoo.ribs.routing.transition.handler.Slider
 import com.badoo.ribs.routing.transition.handler.TransitionHandler
-import com.badoo.ribs.rx2.workflows.RxWorkflowActivity
+import com.badoo.ribs.rx3.workflows.RxWorkflowActivity
 import com.badoo.ribs.sandbox.BuildConfig
 import com.badoo.ribs.sandbox.R
-import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld
 import com.badoo.ribs.sandbox.rib.switcher.Switcher
 import com.badoo.ribs.sandbox.rib.switcher.SwitcherBuilder
 import com.badoo.ribs.sandbox.util.CoffeeMachine
 import com.badoo.ribs.sandbox.util.StupidCoffeeMachine
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.functions.BiFunction
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
 import leakcanary.AppWatcher
 
 /** The sample app's single activity */
@@ -48,10 +46,10 @@ class RootActivity : RxWorkflowActivity() {
     override val rootViewGroup: ViewGroup
         get() = findViewById(R.id.root)
 
-    private lateinit var workflowRoot: Rx2Portal
+    private lateinit var workflowRoot: Rx3Portal
 
     override fun createRib(savedInstanceState: Bundle?) =
-        Rx2PortalBuilder(
+        Rx3PortalBuilder(
             object : Portal.Dependency {
                 override val defaultResolution: (Portal.OtherSide) -> Resolution =
                     { portal ->
@@ -83,19 +81,20 @@ class RootActivity : RxWorkflowActivity() {
                     ).build(buildContext)
                 }
             }
-        ).build(root(
-            savedInstanceState = savedInstanceState,
-            customisations = AppRibCustomisations,
-            defaultPlugins = { node ->
-                if (BuildConfig.DEBUG) {
-                    listOfNotNull(
-                        createLeakDetector(),
-                        createLogger(),
-                        if (node.isRoot) createDebugControlHost() else null
-                    )
-                } else emptyList()
-            }
-        )).also {
+        ).build(
+            root(
+                savedInstanceState = savedInstanceState,
+                customisations = AppRibCustomisations,
+                defaultPlugins = { node ->
+                    if (BuildConfig.DEBUG) {
+                        listOfNotNull(
+                            createLeakDetector(),
+                            createLogger(),
+                            if (node.isRoot) createDebugControlHost() else null
+                        )
+                    } else emptyList()
+                }
+            )).also {
             workflowRoot = it
         }
 
@@ -145,10 +144,9 @@ class RootActivity : RxWorkflowActivity() {
             switcher()
                 .flatMap { it.waitForHelloWorld() }
                 .flatMap { it.somethingSomethingDarkSide() }
-                .toObservable(),
+                .toObservable()
 
-            BiFunction<Switcher, HelloWorld, Unit> { _, _ -> Unit }
-        )
+        ) { _, _ -> Unit }
 
     @Suppress("UNCHECKED_CAST")
     private fun switcher() =
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigBuilder.kt
index 50b2ca220..3c405d7ac 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigBuilder.kt
@@ -24,7 +24,7 @@ class BigBuilder(
         return BigNode(
             buildParams = buildParams,
             viewFactory = customisation.viewFactory(null),
-            plugins =  listOf(
+            plugins = listOf(
                 interactor,
                 router
             )
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigInteractor.kt
index 3b5afa360..ad254777b 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigInteractor.kt
@@ -11,6 +11,13 @@ class BigInteractor(
 ) {
 
     override fun onViewCreated(view: BigView, viewLifecycle: Lifecycle) {
-        view.accept(BigView.ViewModel("My id: " + requestCodeClientId.replace("${BigInteractor::class.java.name}.", "")))
+        view.accept(
+            BigView.ViewModel(
+                "My id: " + requestCodeClientId.replace(
+                    "${BigInteractor::class.java.name}.",
+                    ""
+                )
+            )
+        )
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigView.kt
index d002a73d9..7029ef991 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/BigView.kt
@@ -4,18 +4,18 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.big.BigView.Event
 import com.badoo.ribs.sandbox.rib.big.BigView.ViewModel
 import com.badoo.ribs.sandbox.rib.small.Small
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface BigView : RibView,
     ObservableSource<Event>,
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigChildBuilders.kt
index 86558ebe9..eb60bd791 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigChildBuilders.kt
@@ -14,8 +14,6 @@ internal open class BigChildBuilders(
     class SubtreeDependency(
         dependency: Big.Dependency
     ) : Big.Dependency by dependency,
-        Small.Dependency {
-
-    }
+        Small.Dependency
 }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigRouter.kt
index 4a0948d88..9ef363d13 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/big/routing/BigRouter.kt
@@ -14,14 +14,15 @@ import kotlinx.parcelize.Parcelize
 class BigRouter internal constructor(
     buildParams: BuildParams<Nothing?>,
     private val builders: BigChildBuilders
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = permanent(Permanent.Small)
 ) {
 
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
-            @Parcelize object Small : Permanent()
+            @Parcelize
+            data object Small : Permanent()
         }
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/Blocker.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/Blocker.kt
index efdd03ebb..8371dad5f 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/Blocker.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/Blocker.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.sandbox.rib.blocker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.sandbox.rib.blocker.Blocker.Input
@@ -13,7 +13,7 @@ interface Blocker : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object SomeEvent : Output()
+        data object SomeEvent : Output()
     }
 
     class Customisation(
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerBuilder.kt
index 87ef82e00..184cb7e4b 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerBuilder.kt
@@ -1,8 +1,7 @@
 package com.badoo.ribs.sandbox.rib.blocker
 
-import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.builder.SimpleBuilder
-
+import com.badoo.ribs.core.modality.BuildParams
 
 class BlockerBuilder(
     private val dependency: Blocker.Dependency
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerInteractor.kt
index acd281f1e..6123b5148 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerInteractor.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.sandbox.rib.blocker
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.sandbox.rib.blocker.mapper.ViewEventToOutput
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerNode.kt
index 664d6bf67..860a8456d 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerNode.kt
@@ -1,18 +1,18 @@
 package com.badoo.ribs.sandbox.rib.blocker
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 
 class BlockerNode(
     buildParams: BuildParams<Nothing?>,
     viewFactory: ViewFactory<BlockerView>,
     plugins: List<Plugin> = emptyList(),
     val connector: NodeConnector<Blocker.Input, Blocker.Output> = NodeConnector()
-): Node<BlockerView>(
+) : Node<BlockerView>(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerView.kt
index d558c0854..51100ebcc 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/BlockerView.kt
@@ -1,26 +1,26 @@
 package com.badoo.ribs.sandbox.rib.blocker
 
-import androidx.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
+import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.blocker.BlockerView.Event
 import com.badoo.ribs.sandbox.rib.blocker.BlockerView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface BlockerView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ButtonClicked : Event()
+        data object ButtonClicked : Event()
     }
 
     data class ViewModel(
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/mapper/ViewEventToOutput.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/mapper/ViewEventToOutput.kt
index b7ee41803..e6a396dd5 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/mapper/ViewEventToOutput.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/blocker/mapper/ViewEventToOutput.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.sandbox.rib.blocker.mapper
 import com.badoo.ribs.sandbox.rib.blocker.Blocker
 import com.badoo.ribs.sandbox.rib.blocker.BlockerView
 
-internal object ViewEventToOutput : (BlockerView.Event) -> Blocker.Output? {
+internal object ViewEventToOutput : (BlockerView.Event) -> Blocker.Output {
 
-    override fun invoke(event: BlockerView.Event): Blocker.Output? = when (event) {
+    override fun invoke(event: BlockerView.Event): Blocker.Output = when (event) {
         is BlockerView.Event.ButtonClicked -> Blocker.Output.SomeEvent
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafNode.kt
index 33027493a..a81bb04d6 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafNode.kt
@@ -18,6 +18,4 @@ class ComposeLeafNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), ComposeLeaf, Connectable<Input, Output> by connector {
-
-}
+), ComposeLeaf, Connectable<Input, Output> by connector
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafView.kt
index 9a944e7a2..b2c977d28 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_leaf/ComposeLeafView.kt
@@ -10,6 +10,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -26,9 +27,9 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.rib.compose_leaf.ComposeLeafView.Event
 import com.badoo.ribs.sandbox.rib.compose_leaf.ComposeLeafView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface ComposeLeafView : RibView,
     ObservableSource<Event>,
@@ -114,7 +115,7 @@ private fun LocalState(modifier: Modifier = Modifier) {
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier,
     ) {
-        var counter by rememberSaveable { mutableStateOf(0) }
+        var counter by rememberSaveable { mutableIntStateOf(0) }
         Text(text = "LocalState: $counter")
         Button(onClick = { counter++ }) {
             Text(text = "Add")
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentBuilder.kt
index bdd550f59..e846b20fb 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentBuilder.kt
@@ -14,14 +14,15 @@ import com.badoo.ribs.sandbox.rib.compose_parent.routing.ComposeParentRouter.Con
 import com.badoo.ribs.sandbox.rib.compose_parent.routing.ComposeParentRouter.Configuration.Content
 
 class ComposeParentBuilder(
-    private val dependency: ComposeParent.Dependency
+    dependency: ComposeParent.Dependency
 ) : SimpleBuilder<ComposeParent>() {
 
     private val builders = ComposeParentChildBuilders(dependency)
 
     override fun build(buildParams: BuildParams<Nothing?>): ComposeParent {
         val customisation = buildParams.getOrDefault(ComposeParent.Customisation())
-        val backStack: BackStack<Configuration> = BackStack(initialConfiguration = Content.ComposeLeaf(1), buildParams)
+        val backStack: BackStack<Configuration> =
+            BackStack(initialConfiguration = Content.ComposeLeaf(1), buildParams)
         val interactor = ComposeParentInteractor(buildParams, backStack)
         val router = router(buildParams, backStack, customisation)
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentInteractor.kt
index f6b6f6085..8bac6feb4 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentInteractor.kt
@@ -8,7 +8,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.sandbox.rib.compose_parent.routing.ComposeParentRouter
 import com.badoo.ribs.sandbox.rib.compose_parent.routing.ComposeParentRouter.Configuration.Content
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal class ComposeParentInteractor(
     buildParams: BuildParams<*>,
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentNode.kt
index 4cafb4b81..58422843c 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentNode.kt
@@ -18,6 +18,4 @@ class ComposeParentNode internal constructor(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), ComposeParent, Connectable<Input, Output> by connector {
-
-}
+), ComposeParent, Connectable<Input, Output> by connector
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentView.kt
index 4d42f9ac5..8dcba33ce 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/ComposeParentView.kt
@@ -24,16 +24,16 @@ import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.rib.compose_parent.ComposeParentView.Event
 import com.badoo.ribs.sandbox.rib.compose_parent.ComposeParentView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface ComposeParentView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object NextClicked : Event()
+        data object NextClicked : Event()
     }
 
     data class ViewModel(
@@ -66,7 +66,7 @@ class ComposeParentViewImpl private constructor(
     private var content: MutableState<ComposeView?> = mutableStateOf(null)
 
     override val composable: @Composable () -> Unit = {
-        View(viewModel.value, content.value, { events.accept(Event.NextClicked) })
+        View(viewModel.value, content.value) { events.accept(Event.NextClicked) }
     }
 
     override fun accept(vm: ViewModel) {
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentChildBuilders.kt
index b033a4c0b..78df4501a 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentChildBuilders.kt
@@ -14,8 +14,7 @@ internal class ComposeParentChildBuilders(
     class SubtreeDependency(
         dependency: ComposeParent.Dependency
     ) : ComposeParent.Dependency by dependency,
-        ComposeLeaf.Dependency
-    {
+        ComposeLeaf.Dependency {
         // TODO implement subtree dependencies here
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentRouter.kt
index e978f4386..bcc87b2f6 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/compose_parent/routing/ComposeParentRouter.kt
@@ -18,21 +18,27 @@ class ComposeParentRouter internal constructor(
     routingSource: RoutingSource<Configuration>,
     private val builders: ComposeParentChildBuilders,
     transitionHandler: TransitionHandler<Configuration>? = null
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource,
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
-            @Parcelize data class ComposeLeaf(val i: Int) : Content()
+            @Parcelize
+            data class ComposeLeaf(val i: Int) : Content()
         }
     }
 
     override fun resolve(routing: Routing<Configuration>): Resolution =
         with(builders) {
             when (val configuration = routing.configuration) {
-                is Content.ComposeLeaf -> child { composeLeaf.build(it, ComposeLeaf.Params(configuration.i)) }
+                is Content.ComposeLeaf -> child {
+                    composeLeaf.build(
+                        it,
+                        ComposeLeaf.Params(configuration.i)
+                    )
+                }
             }
         }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExample.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExample.kt
index 2ffa3bf20..0eca4a9c2 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExample.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExample.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.sandbox.rib.dialog_example
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
+import com.badoo.ribs.android.dialog.CanProvideDialogLauncher
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
-import com.badoo.ribs.android.dialog.CanProvideDialogLauncher
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExample.Input
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExample.Output
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleBuilder.kt
index fcdac47a4..5a8f03e08 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleBuilder.kt
@@ -66,7 +66,7 @@ class DialogExampleBuilder(
         buildParams: BuildParams<Nothing?>,
         customisation: DialogExample.Customisation,
         plugins: List<Plugin>
-    ) : DialogExampleNode = DialogExampleNode(
+    ): DialogExampleNode = DialogExampleNode(
         buildParams = buildParams,
         viewFactory = customisation.viewFactory(null),
         plugins = plugins
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleInteractor.kt
index 86664925e..0fae5a83d 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleInteractor.kt
@@ -11,7 +11,7 @@ import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.pushOverlay
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.Event.ShowLazyDialogClicked
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.Event.ShowRibDialogClicked
@@ -23,8 +23,8 @@ import com.badoo.ribs.sandbox.rib.dialog_example.dialog.Dialogs
 import com.badoo.ribs.sandbox.rib.dialog_example.routing.DialogExampleRouter.Configuration
 import com.badoo.ribs.sandbox.rib.dialog_example.routing.DialogExampleRouter.Configuration.Overlay
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum
-import com.jakewharton.rxrelay2.BehaviorRelay
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.BehaviorRelay
+import io.reactivex.rxjava3.functions.Consumer
 
 class DialogExampleInteractor internal constructor(
     buildParams: BuildParams<Nothing?>,
@@ -50,10 +50,10 @@ class DialogExampleInteractor internal constructor(
         viewLifecycle.startStop {
             bind(dummyViewInput to view)
             bind(view to viewEventConsumer)
-            bind(dialogs.themedDialog.rx2() to dialogEventConsumer)
-            bind(dialogs.simpleDialog.rx2() to dialogEventConsumer)
-            bind(dialogs.lazyDialog.rx2() to dialogEventConsumer)
-            bind(dialogs.ribDialog.rx2() to dialogEventConsumer)
+            bind(dialogs.themedDialog.rx3() to dialogEventConsumer)
+            bind(dialogs.simpleDialog.rx3() to dialogEventConsumer)
+            bind(dialogs.lazyDialog.rx3() to dialogEventConsumer)
+            bind(dialogs.ribDialog.rx3() to dialogEventConsumer)
         }
     }
 
@@ -90,12 +90,15 @@ class DialogExampleInteractor internal constructor(
             Dialog.Event.Positive -> {
                 dummyViewInput.accept(ViewModel("Dialog - Positive clicked"))
             }
+
             Dialog.Event.Negative -> {
                 dummyViewInput.accept(ViewModel("Dialog - Negative clicked"))
             }
+
             Dialog.Event.Neutral -> {
                 dummyViewInput.accept(ViewModel("Dialog - Neutral clicked"))
             }
+
             Dialog.Event.Cancelled -> {
                 dummyViewInput.accept(ViewModel("Dialog - Cancelled"))
             }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleNode.kt
index d879dff30..826997b88 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleNode.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.sandbox.rib.dialog_example
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExample.Input
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExample.Output
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleView.kt
index b8bbb2c89..383d37b2a 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleView.kt
@@ -17,20 +17,20 @@ import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.Event.ShowSim
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.Event.ShowThemedDialogClicked
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.Event.Up
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExampleView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface DialogExampleView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ShowThemedDialogClicked : Event()
-        object ShowSimpleDialogClicked : Event()
-        object ShowLazyDialogClicked : Event()
-        object ShowRibDialogClicked : Event()
-        object Up : Event()
+        data object ShowThemedDialogClicked : Event()
+        data object ShowSimpleDialogClicked : Event()
+        data object ShowLazyDialogClicked : Event()
+        data object ShowRibDialogClicked : Event()
+        data object Up : Event()
     }
 
     data class ViewModel(
@@ -40,7 +40,7 @@ interface DialogExampleView : RibView,
     interface Factory : ViewFactoryBuilder<Nothing?, DialogExampleView>
 }
 
-class DialogExampleViewImpl  private constructor(
+class DialogExampleViewImpl private constructor(
     override val androidView: ViewGroup,
     private val events: PublishRelay<Event> = PublishRelay.create()
 ) : AndroidRibView(),
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/LazyDialog.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/LazyDialog.kt
index e8b0014b5..eaa690dd3 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/LazyDialog.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/LazyDialog.kt
@@ -2,5 +2,4 @@ package com.badoo.ribs.sandbox.rib.dialog_example.dialog
 
 import com.badoo.ribs.android.dialog.Dialog
 
-
 class LazyDialog : Dialog<Dialog.Event>({})
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/RibDialog.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/RibDialog.kt
index e703141dd..edb55d3ac 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/RibDialog.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/RibDialog.kt
@@ -1,22 +1,22 @@
 package com.badoo.ribs.sandbox.rib.dialog_example.dialog
 
-import com.badoo.ribs.android.text.Text
 import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.android.dialog.Dialog.Event.Negative
 import com.badoo.ribs.android.dialog.Dialog.Event.Positive
+import com.badoo.ribs.android.text.Text
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsumBuilder
 
 class RibDialog(
     loremIpsumBuilder: LoremIpsumBuilder
 ) : Dialog<Dialog.Event>({
-        title = Text.Resource(R.string.a_title_you_wish)
-        ribFactory {
-            loremIpsumBuilder.build(it)
-        }
-        buttons {
-            positive(Text.Plain("Ok"), Positive)
-            negative(Text.Plain("Cancel"), Negative)
-        }
+    title = Text.Resource(R.string.a_title_you_wish)
+    ribFactory {
+        loremIpsumBuilder.build(it)
+    }
+    buttons {
+        positive(Text.Plain("Ok"), Positive)
+        negative(Text.Plain("Cancel"), Negative)
     }
+}
 )
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/SimpleDialog.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/SimpleDialog.kt
index 6c8801365..e0c6b6cf3 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/SimpleDialog.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/SimpleDialog.kt
@@ -1,12 +1,11 @@
 package com.badoo.ribs.sandbox.rib.dialog_example.dialog
 
-import com.badoo.ribs.android.text.Text
 import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.android.dialog.Dialog.CancellationPolicy.Cancellable
 import com.badoo.ribs.android.dialog.Dialog.Event.Negative
 import com.badoo.ribs.android.dialog.Dialog.Event.Neutral
 import com.badoo.ribs.android.dialog.Dialog.Event.Positive
-
+import com.badoo.ribs.android.text.Text
 
 class SimpleDialog : Dialog<Dialog.Event>({
     // Inject (Smart)Resources in constructor to resolve texts if needed
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/ThemedDialog.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/ThemedDialog.kt
index a8581950d..c6a241d29 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/ThemedDialog.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/dialog/ThemedDialog.kt
@@ -1,14 +1,13 @@
 package com.badoo.ribs.sandbox.rib.dialog_example.dialog
 
-import com.badoo.ribs.android.text.Text
 import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.android.dialog.Dialog.CancellationPolicy.Cancellable
 import com.badoo.ribs.android.dialog.Dialog.Event.Negative
 import com.badoo.ribs.android.dialog.Dialog.Event.Neutral
 import com.badoo.ribs.android.dialog.Dialog.Event.Positive
+import com.badoo.ribs.android.text.Text
 import com.badoo.ribs.sandbox.R
 
-
 class ThemedDialog : Dialog<Dialog.Event>({
     // Inject (Smart)Resources in constructor to resolve texts if needed
     title = Text.Resource(R.string.show_themed_dialog)
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleChildBuilders.kt
index d87a34016..249ad18dc 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleChildBuilders.kt
@@ -14,8 +14,6 @@ internal open class DialogExampleChildBuilders(
     class SubtreeDependency(
         dependency: DialogExample.Dependency
     ) : DialogExample.Dependency by dependency,
-        LoremIpsum.Dependency {
-
-    }
+        LoremIpsum.Dependency
 }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleRouter.kt
index 3a78b1f95..ddeecc139 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/dialog_example/routing/DialogExampleRouter.kt
@@ -20,20 +20,29 @@ class DialogExampleRouter(
     routingSource: RoutingSource<Configuration>,
     private val dialogLauncher: DialogLauncher,
     private val dialogs: Dialogs
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource
 ) {
 
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
-            @Parcelize object Default : Content()
+            @Parcelize
+            data object Default : Content()
         }
+
         sealed class Overlay : Configuration() {
-            @Parcelize object ThemedDialog : Overlay()
-            @Parcelize object SimpleDialog : Overlay()
-            @Parcelize object LazyDialog : Overlay()
-            @Parcelize object RibDialog : Overlay()
+            @Parcelize
+            data object ThemedDialog : Overlay()
+
+            @Parcelize
+            data object SimpleDialog : Overlay()
+
+            @Parcelize
+            data object LazyDialog : Overlay()
+
+            @Parcelize
+            data object RibDialog : Overlay()
         }
     }
 
@@ -42,9 +51,32 @@ class DialogExampleRouter(
         when (routing.configuration) {
             is Content.Default -> noop()
             // TODO can be done with factory to remove first 3 params and make it simpler
-            is Overlay.ThemedDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.themedDialog)
-            is Overlay.SimpleDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.simpleDialog)
-            is Overlay.LazyDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.lazyDialog)
-            is Overlay.RibDialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogs.ribDialog)
+            is Overlay.ThemedDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.themedDialog
+            )
+
+            is Overlay.SimpleDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.simpleDialog
+            )
+
+            is Overlay.LazyDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.lazyDialog
+            )
+
+            is Overlay.RibDialog -> showDialog(
+                routingSource,
+                routing.identifier,
+                dialogLauncher,
+                dialogs.ribDialog
+            )
         }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBar.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBar.kt
index e6cd1bb9e..0f9b7c42b 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBar.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBar.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.sandbox.rib.foo_bar
 
 import com.badoo.ribs.android.permissionrequester.CanProvidePermissionRequester
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBar.Input
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBar.Output
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarBuilder.kt
index f77d55fa1..991e6969c 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarBuilder.kt
@@ -18,9 +18,10 @@ class FooBarBuilder(
         return FooBarNode(
             buildParams = buildParams,
             viewFactory = customisation.viewFactory(null),
-            plugins =  listOf(
+            plugins = listOf(
                 interactor,
-                ParentLongClickListener())
+                ParentLongClickListener()
             )
+        )
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractor.kt
index dbe064c61..ce366b321 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractor.kt
@@ -2,22 +2,22 @@ package com.badoo.ribs.sandbox.rib.foo_bar
 
 import android.Manifest
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.android.permissionrequester.PermissionRequester
 import com.badoo.ribs.android.permissionrequester.PermissionRequester.RequestPermissionsEvent
 import com.badoo.ribs.android.permissionrequester.PermissionRequester.RequestPermissionsEvent.Cancelled
 import com.badoo.ribs.android.permissionrequester.PermissionRequester.RequestPermissionsEvent.RequestPermissionsResult
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.Event.CheckPermissionsButtonClicked
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.Event.RequestPermissionsButtonClicked
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.ViewModel
 import com.badoo.ribs.sandbox.rib.foo_bar.analytics.FooBarAnalytics
 import com.badoo.ribs.sandbox.rib.foo_bar.mapper.ViewEventToAnalyticsEvent
-import com.jakewharton.rxrelay2.BehaviorRelay
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.BehaviorRelay
+import io.reactivex.rxjava3.functions.Consumer
 
 class FooBarInteractor(
     buildParams: BuildParams<Nothing?>,
@@ -37,11 +37,16 @@ class FooBarInteractor(
             bind(view to FooBarAnalytics using ViewEventToAnalyticsEvent)
             bind(view to viewEventConsumer)
             bind(dummyViewInput to view)
-            bind(permissionRequester.events(this@FooBarInteractor).rx2() to permissionEventConsumer)
+            bind(permissionRequester.events(this@FooBarInteractor).rx3() to permissionEventConsumer)
         }
 
         dummyViewInput.accept(
-            ViewModel("My id: " + requestCodeClientId.replace("${FooBarInteractor::class.java.name}.", ""))
+            ViewModel(
+                "My id: " + requestCodeClientId.replace(
+                    "${FooBarInteractor::class.java.name}.",
+                    ""
+                )
+            )
         )
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarNode.kt
index 7d51d47fa..676d0b2ee 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarNode.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.sandbox.rib.foo_bar
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBar.Input
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBar.Output
 
@@ -18,6 +18,4 @@ class FooBarNode(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), FooBar, Connectable<Input, Output> by connector {
-
-}
+), FooBar, Connectable<Input, Output> by connector
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarView.kt
index bb3985765..3de08bb06 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarView.kt
@@ -1,30 +1,30 @@
 package com.badoo.ribs.sandbox.rib.foo_bar
 
-import androidx.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
+import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.Event
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.Event.CheckPermissionsButtonClicked
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.Event.RequestPermissionsButtonClicked
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface FooBarView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object CheckPermissionsButtonClicked : Event()
-        object RequestPermissionsButtonClicked : Event()
+        data object CheckPermissionsButtonClicked : Event()
+        data object RequestPermissionsButtonClicked : Event()
     }
 
     data class ViewModel(
@@ -55,11 +55,12 @@ class FooBarViewImpl private constructor(
 
     private val text: TextView = androidView.findViewById(R.id.foobar_debug)
     private val checkButton: Button = androidView.findViewById(R.id.foobar_button_check_permissions)
-    private val requestButton: Button = androidView.findViewById(R.id.foobar_button_request_permissions)
+    private val requestButton: Button =
+        androidView.findViewById(R.id.foobar_button_request_permissions)
 
     init {
-        checkButton.setOnClickListener { events.accept(CheckPermissionsButtonClicked)}
-        requestButton.setOnClickListener { events.accept(RequestPermissionsButtonClicked)}
+        checkButton.setOnClickListener { events.accept(CheckPermissionsButtonClicked) }
+        requestButton.setOnClickListener { events.accept(RequestPermissionsButtonClicked) }
     }
 
     override fun accept(vm: ViewModel) {
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/analytics/FooBarAnalytics.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/analytics/FooBarAnalytics.kt
index a1edbbdae..e14bb5f32 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/analytics/FooBarAnalytics.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/analytics/FooBarAnalytics.kt
@@ -1,7 +1,7 @@
 package com.badoo.ribs.sandbox.rib.foo_bar.analytics
 
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal object FooBarAnalytics : Consumer<FooBarAnalytics.Event> {
 
@@ -9,7 +9,7 @@ internal object FooBarAnalytics : Consumer<FooBarAnalytics.Event> {
         data class ViewEvent(val event: FooBarView.Event) : Event()
     }
 
-    override fun accept(event: FooBarAnalytics.Event) {
+    override fun accept(event: Event) {
         // TODO Implement tracking
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/feature/FooBarFeature.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/feature/FooBarFeature.kt
index fada6fac8..d2ff683c2 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/feature/FooBarFeature.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/feature/FooBarFeature.kt
@@ -9,8 +9,8 @@ import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature.Effect
 import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature.News
 import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature.State
 import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature.Wish
-import io.reactivex.Observable
-import io.reactivex.Observable.empty
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Observable.empty
 
 class FooBarFeature : ActorReducerFeature<Wish, Effect, State, News>(
     initialState = State(),
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/InputToWish.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/InputToWish.kt
deleted file mode 100644
index 04dfcee3f..000000000
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/InputToWish.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.badoo.ribs.sandbox.rib.foo_bar.mapper
-
-import com.badoo.ribs.sandbox.rib.foo_bar.FooBar
-import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature
-
-internal object InputToWish : (FooBar.Input) -> FooBarFeature.Wish? {
-
-    override fun invoke(event: FooBar.Input): FooBarFeature.Wish? =
-        TODO("Implement FooBarInputToWish mapping")
-}
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/NewsToOutput.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/NewsToOutput.kt
deleted file mode 100644
index 8bfd91614..000000000
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/NewsToOutput.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.badoo.ribs.sandbox.rib.foo_bar.mapper
-
-import com.badoo.ribs.sandbox.rib.foo_bar.FooBar
-import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature
-
-internal object NewsToOutput : (FooBarFeature.News) -> FooBar.Output? {
-
-    override fun invoke(news: FooBarFeature.News): FooBar.Output? =
-        TODO("Implement FooBarNewsToOutput mapping")
-}
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToAnalyticsEvent.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToAnalyticsEvent.kt
index 58c88898f..775ae95e3 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToAnalyticsEvent.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToAnalyticsEvent.kt
@@ -4,8 +4,8 @@ import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView
 import com.badoo.ribs.sandbox.rib.foo_bar.analytics.FooBarAnalytics
 import com.badoo.ribs.sandbox.rib.foo_bar.analytics.FooBarAnalytics.Event.ViewEvent
 
-internal object ViewEventToAnalyticsEvent : (FooBarView.Event) -> FooBarAnalytics.Event? {
+internal object ViewEventToAnalyticsEvent : (FooBarView.Event) -> FooBarAnalytics.Event {
 
-    override fun invoke(event: FooBarView.Event): FooBarAnalytics.Event? =
+    override fun invoke(event: FooBarView.Event): FooBarAnalytics.Event =
         ViewEvent(event)
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToWish.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToWish.kt
deleted file mode 100644
index 857cd77d7..000000000
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/foo_bar/mapper/ViewEventToWish.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.badoo.ribs.sandbox.rib.foo_bar.mapper
-
-import com.badoo.ribs.sandbox.rib.foo_bar.FooBarView
-import com.badoo.ribs.sandbox.rib.foo_bar.feature.FooBarFeature
-
-internal object ViewEventToWish : (FooBarView.Event) -> FooBarFeature.Wish? {
-
-    override fun invoke(event: FooBarView.Event): FooBarFeature.Wish? =
-        TODO("Implement FooBarViewEventToWish mapping")
-}
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloDebugView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloDebugView.kt
index a8fdf351a..a8a32d233 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloDebugView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloDebugView.kt
@@ -6,7 +6,7 @@ import android.widget.Toast
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.plugin.utils.debug.DebugControls
 import com.badoo.ribs.sandbox.R
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 
 class HelloDebugControls : DebugControls<HelloWorld>(
     label = "Hello world",
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorld.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorld.kt
index ccfe40493..a8121ff99 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorld.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorld.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.sandbox.rib.hello_world
 
 import com.badoo.ribs.android.activitystarter.CanProvideActivityStarter
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
 import com.badoo.ribs.portal.CanProvidePortal
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld.Input
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld.Output
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 
 interface HelloWorld : Rib, Connectable<Input, Output> {
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldBuilder.kt
index 109d03d6a..5d45d3028 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldBuilder.kt
@@ -29,7 +29,7 @@ class HelloWorldBuilder(
         return HelloWorldNode(
             buildParams = buildParams,
             viewFactory = customisation.viewFactory(null),
-            plugins =  listOfNotNull(
+            plugins = listOfNotNull(
                 interactor,
                 router,
                 HelloDebugControls().takeIf { BuildConfig.DEBUG }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldInteractor.kt
index 964e91f6c..faeafca99 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldInteractor.kt
@@ -3,14 +3,14 @@ package com.badoo.ribs.sandbox.rib.hello_world
 import android.app.Activity
 import android.content.Intent
 import androidx.lifecycle.Lifecycle
+import com.badoo.binder.using
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.mvicore.android.lifecycle.startStop
-import com.badoo.binder.using
 import com.badoo.ribs.android.activitystarter.ActivityStarter
 import com.badoo.ribs.android.activitystarter.ActivityStarter.ActivityResultEvent
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.sandbox.app.OtherActivity
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorldView.ViewModel
 import com.badoo.ribs.sandbox.rib.hello_world.analytics.HelloWorldAnalytics
@@ -18,8 +18,8 @@ import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature
 import com.badoo.ribs.sandbox.rib.hello_world.mapper.InputToWish
 import com.badoo.ribs.sandbox.rib.hello_world.mapper.NewsToOutput
 import com.badoo.ribs.sandbox.rib.hello_world.mapper.ViewEventToAnalyticsEvent
-import com.jakewharton.rxrelay2.BehaviorRelay
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.BehaviorRelay
+import io.reactivex.rxjava3.functions.Consumer
 
 class HelloWorldInteractor(
     buildParams: BuildParams<Nothing?>,
@@ -34,8 +34,10 @@ class HelloWorldInteractor(
     }
 
     private val dummyViewInput = BehaviorRelay.createDefault(
-        ViewModel("My id: " + buildParams.identifier.uuid.toString()
-            .replace("${HelloWorldInteractor::class.java.name}.", ""))
+        ViewModel(
+            "My id: " + buildParams.identifier.uuid.toString()
+                .replace("${HelloWorldInteractor::class.java.name}.", "")
+        )
     )
 
     override fun onCreate(nodeLifecycle: Lifecycle) {
@@ -49,12 +51,12 @@ class HelloWorldInteractor(
         viewLifecycle.startStop {
             bind(view to HelloWorldAnalytics using ViewEventToAnalyticsEvent)
             bind(view to viewEventConsumer)
-            bind(activityStarter.events(this@HelloWorldInteractor).rx2() to activityResultConsumer)
+            bind(activityStarter.events(this@HelloWorldInteractor).rx3() to activityResultConsumer)
             bind(dummyViewInput to view)
         }
     }
 
-    private val viewEventConsumer : Consumer<HelloWorldView.Event> = Consumer {
+    private val viewEventConsumer: Consumer<HelloWorldView.Event> = Consumer {
         when (it) {
             HelloWorldView.Event.ButtonClicked -> launchOtherActivityForResult()
         }
@@ -67,12 +69,15 @@ class HelloWorldInteractor(
         }
     }
 
-    private val activityResultConsumer : Consumer<ActivityResultEvent> = Consumer {
+    private val activityResultConsumer: Consumer<ActivityResultEvent> = Consumer {
         if (it.requestCode == REQUEST_CODE_OTHER_ACTIVITY) {
             if (it.resultCode == Activity.RESULT_OK) {
                 dummyViewInput.accept(
                     ViewModel(
-                        "Data returned: " + it.data?.getIntExtra(OtherActivity.KEY_RETURNED_DATA, -1)?.toString()
+                        "Data returned: " + it.data?.getIntExtra(
+                            OtherActivity.KEY_RETURNED_DATA,
+                            -1
+                        )?.toString()
                     )
                 )
             }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldNode.kt
index 5b1f7f4f9..32b279580 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldNode.kt
@@ -1,15 +1,15 @@
 package com.badoo.ribs.sandbox.rib.hello_world
 
 import android.util.Log
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld.Input
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld.Output
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 
 class HelloWorldNode(
     buildParams: BuildParams<*>,
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldView.kt
index d1ab4a78f..099585967 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/HelloWorldView.kt
@@ -4,25 +4,25 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorldView.Event
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorldView.ViewModel
 import com.badoo.ribs.sandbox.rib.small.SmallNode
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface HelloWorldView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ButtonClicked : Event()
+        data object ButtonClicked : Event()
     }
 
     data class ViewModel(
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/analytics/HelloWorldAnalytics.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/analytics/HelloWorldAnalytics.kt
index 804243294..77952dddb 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/analytics/HelloWorldAnalytics.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/analytics/HelloWorldAnalytics.kt
@@ -1,7 +1,7 @@
 package com.badoo.ribs.sandbox.rib.hello_world.analytics
 
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorldView
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.functions.Consumer
 
 internal object HelloWorldAnalytics : Consumer<HelloWorldAnalytics.Event> {
 
@@ -9,7 +9,7 @@ internal object HelloWorldAnalytics : Consumer<HelloWorldAnalytics.Event> {
         data class ViewEvent(val event: HelloWorldView.Event) : Event()
     }
 
-    override fun accept(event: HelloWorldAnalytics.Event) {
+    override fun accept(event: Event) {
         // TODO Implement tracking
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/feature/HelloWorldFeature.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/feature/HelloWorldFeature.kt
index 4b3104930..0f9500d23 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/feature/HelloWorldFeature.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/feature/HelloWorldFeature.kt
@@ -9,8 +9,8 @@ import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature.Effect
 import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature.News
 import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature.State
 import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature.Wish
-import io.reactivex.Observable
-import io.reactivex.Observable.empty
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Observable.empty
 
 class HelloWorldFeature : ActorReducerFeature<Wish, Effect, State, News>(
     initialState = State(),
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/mapper/ViewEventToWish.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/mapper/ViewEventToWish.kt
deleted file mode 100644
index 7a1344dfb..000000000
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/mapper/ViewEventToWish.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.badoo.ribs.sandbox.rib.hello_world.mapper
-
-import com.badoo.ribs.sandbox.rib.hello_world.HelloWorldView
-import com.badoo.ribs.sandbox.rib.hello_world.feature.HelloWorldFeature
-
-internal object ViewEventToWish : (HelloWorldView.Event) -> HelloWorldFeature.Wish? {
-
-    override fun invoke(event: HelloWorldView.Event): HelloWorldFeature.Wish? =
-        TODO("Implement HelloWorldViewEventToWish mapping")
-}
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldChildBuilders.kt
index 987ed7420..9a40b9511 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldChildBuilders.kt
@@ -14,8 +14,6 @@ internal open class HelloWorldChildBuilders(
     class SubtreeDependency(
         dependency: HelloWorld.Dependency
     ) : HelloWorld.Dependency by dependency,
-        Small.Dependency {
-
-    }
+        Small.Dependency
 }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldRouter.kt
index de25457a1..67c006be4 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/hello_world/routing/HelloWorldRouter.kt
@@ -14,13 +14,14 @@ import kotlinx.parcelize.Parcelize
 class HelloWorldRouter internal constructor(
     buildParams: BuildParams<Nothing?>,
     private val builders: HelloWorldChildBuilders
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = permanent(Small)
 ) {
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
-            @Parcelize object Small : Permanent()
+            @Parcelize
+            data object Small : Permanent()
         }
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsum.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsum.kt
index 197ce1f34..a24f60a64 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsum.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsum.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.sandbox.rib.lorem_ipsum
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum.Input
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum.Output
 
@@ -13,7 +13,7 @@ interface LoremIpsum : Rib, Connectable<Input, Output> {
     sealed class Input
 
     sealed class Output {
-        object SomeEvent : Output()
+        data object SomeEvent : Output()
     }
 
     class Customisation(
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumInteractor.kt
index 751034af2..40304028b 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumInteractor.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.sandbox.rib.lorem_ipsum
 
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.mapper.ViewEventToOutput
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumNode.kt
index 2edc0fe62..18f943fac 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumNode.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.sandbox.rib.lorem_ipsum
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum.Input
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum.Output
 
@@ -14,10 +14,8 @@ class LoremIpsumNode(
     viewFactory: ViewFactory<LoremIpsumView>,
     plugins: List<Plugin> = emptyList(),
     connector: NodeConnector<Input, Output> = NodeConnector()
-): Node<LoremIpsumView>(
+) : Node<LoremIpsumView>(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), LoremIpsum, Connectable<Input, Output> by connector {
-
-}
+), LoremIpsum, Connectable<Input, Output> by connector
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumView.kt
index a8f42ef0a..73e97ae2b 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/LoremIpsumView.kt
@@ -1,26 +1,26 @@
 package com.badoo.ribs.sandbox.rib.lorem_ipsum
 
-import androidx.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
+import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsumView.Event
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsumView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface LoremIpsumView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ButtonClicked : Event()
+        data object ButtonClicked : Event()
     }
 
     data class ViewModel(
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/mapper/ViewEventToOutput.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/mapper/ViewEventToOutput.kt
index e2fd8e633..dbf3c5c8a 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/mapper/ViewEventToOutput.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/lorem_ipsum/mapper/ViewEventToOutput.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.sandbox.rib.lorem_ipsum.mapper
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsum
 import com.badoo.ribs.sandbox.rib.lorem_ipsum.LoremIpsumView
 
-internal object ViewEventToOutput : (LoremIpsumView.Event) -> LoremIpsum.Output? {
+internal object ViewEventToOutput : (LoremIpsumView.Event) -> LoremIpsum.Output {
 
-    override fun invoke(event: LoremIpsumView.Event): LoremIpsum.Output? = when (event) {
+    override fun invoke(event: LoremIpsumView.Event): LoremIpsum.Output = when (event) {
         is LoremIpsumView.Event.ButtonClicked -> LoremIpsum.Output.SomeEvent
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/Menu.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/Menu.kt
index 5f6fec24a..f525c8b08 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/Menu.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/Menu.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.sandbox.rib.menu
 
 import android.os.Parcelable
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.customisation.RibCustomisation
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
 import com.badoo.ribs.sandbox.rib.menu.Menu.Input
 import com.badoo.ribs.sandbox.rib.menu.Menu.Output
 import kotlinx.parcelize.Parcelize
@@ -21,10 +21,17 @@ interface Menu : Rib, Connectable<Input, Output> {
     }
 
     sealed class MenuItem : Parcelable {
-        @Parcelize object HelloWorld : MenuItem()
-        @Parcelize object FooBar : MenuItem()
-        @Parcelize object Dialogs : MenuItem()
-        @Parcelize object Compose : MenuItem()
+        @Parcelize
+        data object HelloWorld : MenuItem()
+
+        @Parcelize
+        data object FooBar : MenuItem()
+
+        @Parcelize
+        data object Dialogs : MenuItem()
+
+        @Parcelize
+        data object Compose : MenuItem()
 
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuInteractor.kt
index 0e21eb812..3ec4282dd 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuInteractor.kt
@@ -1,9 +1,9 @@
 package com.badoo.ribs.sandbox.rib.menu
 
 import androidx.lifecycle.Lifecycle
+import com.badoo.binder.using
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.mvicore.android.lifecycle.startStop
-import com.badoo.binder.using
 import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.sandbox.rib.menu.feature.MenuFeature
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuNode.kt
index 43120024a..638eb6cfe 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuNode.kt
@@ -1,11 +1,11 @@
 package com.badoo.ribs.sandbox.rib.menu
 
-import com.badoo.ribs.rx2.clienthelper.connector.Connectable
-import com.badoo.ribs.rx2.clienthelper.connector.NodeConnector
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.rx3.clienthelper.connector.Connectable
+import com.badoo.ribs.rx3.clienthelper.connector.NodeConnector
 import com.badoo.ribs.sandbox.rib.menu.Menu.Input
 import com.badoo.ribs.sandbox.rib.menu.Menu.Output
 
@@ -14,7 +14,7 @@ class MenuNode(
     viewFactory: ViewFactory<MenuView>,
     plugins: List<Plugin> = emptyList(),
     connector: NodeConnector<Input, Output> = NodeConnector()
-): Node<MenuView>(
+) : Node<MenuView>(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuView.kt
index cef0d6315..91ba09642 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/MenuView.kt
@@ -1,22 +1,22 @@
 package com.badoo.ribs.sandbox.rib.menu
 
-import androidx.annotation.LayoutRes
-import androidx.core.content.ContextCompat
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView2
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.menu.Menu.MenuItem
 import com.badoo.ribs.sandbox.rib.menu.MenuView.Event
 import com.badoo.ribs.sandbox.rib.menu.MenuView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface MenuView : RibView, ObservableSource<Event>, Consumer<ViewModel> {
 
@@ -56,7 +56,7 @@ class MenuViewImpl private constructor(
     private var dialogs: TextView = menuItem(R.id.menu_dialogs, MenuItem.Dialogs)
     private var compose: TextView = menuItem(R.id.menu_compose, MenuItem.Compose)
 
-    fun menuItem(id: Int, menuItem: MenuItem) : TextView =
+    fun menuItem(id: Int, menuItem: MenuItem): TextView =
         androidView.findViewById<TextView>(id).apply {
             setOnClickListener { events.accept(Event.Select(menuItem)) }
         }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/InputToState.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/InputToState.kt
index 0138185d8..c0ef26478 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/InputToState.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/InputToState.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.sandbox.rib.menu.mapper
 import com.badoo.ribs.sandbox.rib.menu.Menu.Input
 import com.badoo.ribs.sandbox.rib.menu.feature.MenuFeature
 
-object InputToState: (Input) -> MenuFeature.State {
+object InputToState : (Input) -> MenuFeature.State {
     override fun invoke(input: Input): MenuFeature.State =
         when (input) {
             is Input.SelectMenuItem -> MenuFeature.State(input.menuItem)
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/StateToViewModel.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/StateToViewModel.kt
index a2c7eb7c3..2587e297d 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/StateToViewModel.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/StateToViewModel.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.sandbox.rib.menu.mapper
 import com.badoo.ribs.sandbox.rib.menu.MenuView
 import com.badoo.ribs.sandbox.rib.menu.feature.MenuFeature
 
-object StateToViewModel: (MenuFeature.State) -> MenuView.ViewModel {
+object StateToViewModel : (MenuFeature.State) -> MenuView.ViewModel {
     override fun invoke(state: MenuFeature.State): MenuView.ViewModel =
         MenuView.ViewModel(state.selected)
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/ViewEventToOutput.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/ViewEventToOutput.kt
index 98bc98ea0..9eb85537c 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/ViewEventToOutput.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/menu/mapper/ViewEventToOutput.kt
@@ -3,9 +3,9 @@ package com.badoo.ribs.sandbox.rib.menu.mapper
 import com.badoo.ribs.sandbox.rib.menu.Menu.Output
 import com.badoo.ribs.sandbox.rib.menu.MenuView
 
-internal object ViewEventToOutput : (MenuView.Event) -> Output? {
+internal object ViewEventToOutput : (MenuView.Event) -> Output {
 
-    override fun invoke(event: MenuView.Event): Output? = when (event) {
+    override fun invoke(event: MenuView.Event): Output = when (event) {
         is MenuView.Event.Select -> Output.MenuItemSelected(
             menuItem = event.menuItem
         )
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestBuilder.kt
index 206a6bb8b..4b5c1eff0 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestBuilder.kt
@@ -15,7 +15,7 @@ class PortalOverlayTestBuilder(
         return PortalOverlayTestNode(
             buildParams = buildParams,
             viewFactory = customisation.viewFactory(null),
-            plugins =  listOf(
+            plugins = listOf(
                 interactor
             )
         )
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestNode.kt
index f15f7d42d..188239cf5 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestNode.kt
@@ -13,6 +13,4 @@ class PortalOverlayTestNode(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), PortalOverlayTest {
-
-}
+), PortalOverlayTest
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestView.kt
index e7bc11823..ac7d3d17d 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/portal_overlay_test/PortalOverlayTestView.kt
@@ -1,18 +1,18 @@
 package com.badoo.ribs.sandbox.rib.portal_overlay_test
 
-import androidx.annotation.LayoutRes
 import android.view.ViewGroup
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
+import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.portal_overlay_test.PortalOverlayTestView.Event
 import com.badoo.ribs.sandbox.rib.portal_overlay_test.PortalOverlayTestView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface PortalOverlayTestView : RibView,
     ObservableSource<Event>,
@@ -46,6 +46,6 @@ class PortalOverlayTestViewImpl private constructor(
         }
     }
 
-    override fun accept(vm: PortalOverlayTestView.ViewModel) {
+    override fun accept(vm: ViewModel) {
     }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/Small.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/Small.kt
index 2d3ff35a1..7bf6cd4f8 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/Small.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/Small.kt
@@ -10,7 +10,7 @@ interface Small : Rib {
     interface Dependency : CanProvidePortal
 
     interface ExtraDependencies : CanProvidePortal {
-        fun customisation(): Small.Customisation
+        fun customisation(): Customisation
         fun buildParams(): BuildParams<Nothing?>
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallBuilder.kt
index b61250a73..edf20ed75 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallBuilder.kt
@@ -66,7 +66,7 @@ class SmallBuilder(
         buildParams: BuildParams<Nothing?>,
         customisation: Small.Customisation,
         plugins: List<Plugin>
-    ) : SmallNode = SmallNode(
+    ): SmallNode = SmallNode(
         buildParams = buildParams,
         viewFactory = customisation.viewFactory(null),
         plugins = plugins
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallInteractor.kt
index c1703251f..2e5892457 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallInteractor.kt
@@ -6,11 +6,11 @@ import com.badoo.ribs.clienthelper.interactor.Interactor
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.portal.Portal
 import com.badoo.ribs.routing.source.backstack.BackStack
-import com.badoo.ribs.sandbox.rib.small.routing.SmallRouter.Configuration
-import com.badoo.ribs.sandbox.rib.small.routing.SmallRouter.Configuration.FullScreen
 import com.badoo.ribs.sandbox.rib.small.SmallView.Event
 import com.badoo.ribs.sandbox.rib.small.SmallView.ViewModel
-import io.reactivex.functions.Consumer
+import com.badoo.ribs.sandbox.rib.small.routing.SmallRouter.Configuration
+import com.badoo.ribs.sandbox.rib.small.routing.SmallRouter.Configuration.FullScreen
+import io.reactivex.rxjava3.functions.Consumer
 
 class SmallInteractor(
     private val buildParams: BuildParams<Nothing?>,
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallNode.kt
index 8dd12c9bc..b75008c55 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallNode.kt
@@ -13,6 +13,4 @@ class SmallNode(
     buildParams = buildParams,
     viewFactory = viewFactory,
     plugins = plugins
-), Small {
-
-}
+), Small
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallView.kt
index cf4b5d117..bfe6174e1 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/SmallView.kt
@@ -1,28 +1,28 @@
 package com.badoo.ribs.sandbox.rib.small
 
-import androidx.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactoryBuilder
+import androidx.annotation.LayoutRes
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.view.AndroidRibView
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.core.view.ViewFactoryBuilder
 import com.badoo.ribs.sandbox.R
 import com.badoo.ribs.sandbox.rib.small.SmallView.Event
 import com.badoo.ribs.sandbox.rib.small.SmallView.ViewModel
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface SmallView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object OpenBigClicked : Event()
-        object OpenOverlayClicked : Event()
+        data object OpenBigClicked : Event()
+        data object OpenOverlayClicked : Event()
     }
 
     data class ViewModel(
@@ -55,8 +55,8 @@ class SmallViewImpl private constructor(
     private val openOverlayButton = androidView.findViewById<Button>(R.id.open_overlay)
 
     init {
-        openBigButton.setOnClickListener { events.accept(Event.OpenBigClicked)  }
-        openOverlayButton.setOnClickListener { events.accept(Event.OpenOverlayClicked)  }
+        openBigButton.setOnClickListener { events.accept(Event.OpenBigClicked) }
+        openOverlayButton.setOnClickListener { events.accept(Event.OpenOverlayClicked) }
     }
 
     override fun accept(vm: ViewModel) {
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallChildBuilders.kt
index 25e6cf607..61f023237 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallChildBuilders.kt
@@ -18,7 +18,5 @@ internal open class SmallChildBuilders(
         dependency: Small.Dependency
     ) : Small.Dependency by dependency,
         PortalOverlayTest.Dependency,
-        Big.Dependency {
-
-    }
+        Big.Dependency
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallRouter.kt
index 0d5d0cbb9..ebaa696e5 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/small/routing/SmallRouter.kt
@@ -17,17 +17,22 @@ class SmallRouter internal constructor(
     buildParams: BuildParams<Nothing?>,
     routingSource: RoutingSource<Configuration>,
     private val builders: SmallChildBuilders
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource
 ) {
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
-            @Parcelize object Default : Content()
+            @Parcelize
+            data object Default : Content()
         }
+
         sealed class FullScreen : Configuration() {
-            @Parcelize object ShowBig : FullScreen()
-            @Parcelize object ShowOverlay : FullScreen()
+            @Parcelize
+            data object ShowBig : FullScreen()
+
+            @Parcelize
+            data object ShowOverlay : FullScreen()
         }
     }
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/Switcher.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/Switcher.kt
index 0dc88331c..b7d67b404 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/Switcher.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/Switcher.kt
@@ -13,7 +13,7 @@ import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherTransitionHandler
 import com.badoo.ribs.sandbox.util.CoffeeMachine
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 
 interface Switcher : Rib {
 
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherBuilder.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherBuilder.kt
index d38c84a2f..0120cfb8c 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherBuilder.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherBuilder.kt
@@ -4,7 +4,7 @@ import com.badoo.ribs.builder.SimpleBuilder
 import com.badoo.ribs.core.modality.BuildParams
 import com.badoo.ribs.routing.router.Router
 import com.badoo.ribs.routing.source.backstack.BackStack
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.sandbox.BuildConfig
 import com.badoo.ribs.sandbox.rib.switcher.dialog.DialogToTestOverlay
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherChildBuilders
@@ -27,7 +27,7 @@ class SwitcherBuilder(
 
     override fun build(buildParams: BuildParams<Nothing?>): SwitcherNode {
         val customisation = buildParams.getOrDefault(Switcher.Customisation())
-        val backStack  = backStack(buildParams)
+        val backStack = backStack(buildParams)
         val router = router(buildParams, customisation, backStack)
         val interactor = interactor(buildParams, backStack, router)
 
@@ -57,7 +57,7 @@ class SwitcherBuilder(
         SwitcherInteractor(
             buildParams = buildParams,
             backStack = backStack,
-            transitions = router.transitionStates.rx2().distinctUntilChanged(),
+            transitions = router.transitionStates.rx3().distinctUntilChanged(),
             transitionSettled = { router.transitionState.isSettled },
             dialogToTestOverlay = dialogToTestOverlay
         )
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherDebugView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherDebugView.kt
index 1957ac830..66d81b8e2 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherDebugView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherDebugView.kt
@@ -5,7 +5,7 @@ import android.widget.Button
 import com.badoo.ribs.core.customisation.inflate
 import com.badoo.ribs.core.plugin.utils.debug.DebugControls
 import com.badoo.ribs.sandbox.R
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 
 class SwitcherDebugControls : DebugControls<Switcher>(
     label = "Switcher",
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractor.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractor.kt
index 5822a819f..7e2c85410 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractor.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractor.kt
@@ -2,8 +2,8 @@ package com.badoo.ribs.sandbox.rib.switcher
 
 import android.util.Log
 import androidx.lifecycle.Lifecycle
-import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.binder.using
+import com.badoo.mvicore.android.lifecycle.startStop
 import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.clienthelper.childaware.childAware
 import com.badoo.ribs.clienthelper.interactor.Interactor
@@ -16,7 +16,7 @@ import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.pop
 import com.badoo.ribs.routing.source.backstack.operation.push
 import com.badoo.ribs.routing.source.backstack.operation.pushOverlay
-import com.badoo.ribs.rx2.adapter.rx2
+import com.badoo.ribs.rx3.adapter.rx3
 import com.badoo.ribs.sandbox.rib.blocker.Blocker
 import com.badoo.ribs.sandbox.rib.menu.Menu
 import com.badoo.ribs.sandbox.rib.menu.Menu.Input.SelectMenuItem
@@ -30,8 +30,8 @@ import com.badoo.ribs.sandbox.rib.switcher.dialog.DialogToTestOverlay
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Content
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Overlay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 @SuppressWarnings("LongParameterList")
 internal class SwitcherInteractor(
@@ -85,6 +85,7 @@ internal class SwitcherInteractor(
             Dialog.Event.Positive -> {
                 // do something if you want
             }
+
             else -> {}
         }
     }
@@ -106,7 +107,7 @@ internal class SwitcherInteractor(
 
             createDestroy<Menu> { menu ->
                 bind(menu.output to menuListener)
-                bind(backStack.activeConfigurations.rx2() to menu.input using ConfigurationToMenuInput)
+                bind(backStack.activeConfigurations.rx3() to menu.input using ConfigurationToMenuInput)
             }
         }
     }
@@ -115,7 +116,7 @@ internal class SwitcherInteractor(
         super.onViewCreated(view, viewLifecycle)
         viewLifecycle.startStop {
             bind(view to viewEventConsumer)
-            bind(dialogToTestOverlay.rx2() to dialogEventConsumer)
+            bind(dialogToTestOverlay.rx3() to dialogEventConsumer)
             bind(transitions to view using transitionStateToViewModel)
         }
     }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherNode.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherNode.kt
index 971b7ec55..7a5f87734 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherNode.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherNode.kt
@@ -6,13 +6,13 @@ import com.badoo.ribs.core.plugin.Plugin
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
+import com.badoo.ribs.rx3.workflows.RxWorkflowNode
 import com.badoo.ribs.sandbox.rib.dialog_example.DialogExample
 import com.badoo.ribs.sandbox.rib.foo_bar.FooBar
 import com.badoo.ribs.sandbox.rib.hello_world.HelloWorld
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Content
-import com.badoo.ribs.rx2.workflows.RxWorkflowNode
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 
 class SwitcherNode internal constructor(
     buildParams: BuildParams<*>,
@@ -24,7 +24,7 @@ class SwitcherNode internal constructor(
     viewFactory = viewFactory,
     plugins = plugins
 ), Switcher {
-    
+
     override fun attachHelloWorld(): Single<HelloWorld> =
         attachWorkflow {
             Log.d("WORKFLOW", "Switcher / attachHelloWorld")
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherView.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherView.kt
index 51861b109..c5b713d07 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherView.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherView.kt
@@ -15,17 +15,17 @@ import com.badoo.ribs.sandbox.rib.menu.MenuNode
 import com.badoo.ribs.sandbox.rib.switcher.SwitcherView.Event
 import com.badoo.ribs.sandbox.rib.switcher.SwitcherView.ViewModel
 import com.badoo.ribs.sandbox.util.CoffeeMachine
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 
 interface SwitcherView : RibView,
     ObservableSource<Event>,
     Consumer<ViewModel> {
 
     sealed class Event {
-        object ShowOverlayDialogClicked : Event()
-        object ShowBlockerClicked : Event()
+        data object ShowOverlayDialogClicked : Event()
+        data object ShowBlockerClicked : Event()
     }
 
     data class ViewModel(
@@ -62,7 +62,8 @@ class SwitcherViewImpl private constructor(
 
     private val menuContainer: ViewGroup = androidView.findViewById(R.id.menu_container)
     private val contentContainer: ViewGroup = androidView.findViewById(R.id.content_container)
-//    private val blockerContainer: ViewGroup = androidView.findViewById(R.id.blocker_container)
+
+    //    private val blockerContainer: ViewGroup = androidView.findViewById(R.id.blocker_container)
     private val showOverlayDialog: Button = androidView.findViewById(R.id.show_overlay_dialog)
     private val showBlocker: Button = androidView.findViewById(R.id.show_blocker)
     private val makeCoffee: Button = androidView.findViewById(R.id.make_coffee)
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/dialog/DialogToTestOverlay.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/dialog/DialogToTestOverlay.kt
index 2fdad682c..9051829af 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/dialog/DialogToTestOverlay.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/dialog/DialogToTestOverlay.kt
@@ -1,11 +1,10 @@
 package com.badoo.ribs.sandbox.rib.switcher.dialog
 
-import com.badoo.ribs.android.text.Text
-import com.badoo.ribs.routing.resolution.RibFactory
 import com.badoo.ribs.android.dialog.Dialog
 import com.badoo.ribs.android.dialog.Dialog.CancellationPolicy.Cancellable
 import com.badoo.ribs.android.dialog.Dialog.Event.Positive
-
+import com.badoo.ribs.android.text.Text
+import com.badoo.ribs.routing.resolution.RibFactory
 
 /**
  * This dialog should be tested where there are other Configurations as well,
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherChildBuilders.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherChildBuilders.kt
index b80826c4c..52e85392c 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherChildBuilders.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherChildBuilders.kt
@@ -37,7 +37,5 @@ internal open class SwitcherChildBuilders(
         FooBar.Dependency,
         DialogExample.Dependency,
         Blocker.Dependency,
-        ComposeParent.Dependency {
-
-    }
+        ComposeParent.Dependency
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherRouter.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherRouter.kt
index dc0d25eba..212b9e96d 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherRouter.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherRouter.kt
@@ -25,24 +25,37 @@ class SwitcherRouter internal constructor(
     private val builders: SwitcherChildBuilders,
     private val dialogLauncher: DialogLauncher,
     private val dialogToTestOverlay: DialogToTestOverlay
-): Router<Configuration>(
+) : Router<Configuration>(
     buildParams = buildParams,
     routingSource = routingSource + permanent(Permanent.Menu),
     transitionHandler = transitionHandler
 ) {
     sealed class Configuration : Parcelable {
         sealed class Permanent : Configuration() {
-            @Parcelize object Menu : Permanent()
+            @Parcelize
+            data object Menu : Permanent()
         }
+
         sealed class Content : Configuration() {
-            @Parcelize object Hello : Content()
-            @Parcelize object Foo : Content()
-            @Parcelize object DialogsExample : Content()
-            @Parcelize object Compose : Content()
-            @Parcelize object Blocker : Content()
+            @Parcelize
+            data object Hello : Content()
+
+            @Parcelize
+            data object Foo : Content()
+
+            @Parcelize
+            data object DialogsExample : Content()
+
+            @Parcelize
+            data object Compose : Content()
+
+            @Parcelize
+            data object Blocker : Content()
         }
+
         sealed class Overlay : Configuration() {
-            @Parcelize object Dialog : Overlay()
+            @Parcelize
+            data object Dialog : Overlay()
         }
     }
 
@@ -52,10 +65,15 @@ class SwitcherRouter internal constructor(
                 is Permanent.Menu -> child { menu.build(it) }
                 is Content.Hello -> child { helloWorld.build(it) }
                 is Content.Foo -> child { fooBar.build(it) }
-                is Content.DialogsExample -> child {  dialogExample.build(it) }
+                is Content.DialogsExample -> child { dialogExample.build(it) }
                 is Content.Compose -> child { composeParent.build(it) }
                 is Content.Blocker -> child { blocker.build(it) }
-                is Overlay.Dialog -> showDialog(routingSource, routing.identifier, dialogLauncher, dialogToTestOverlay)
+                is Overlay.Dialog -> showDialog(
+                    routingSource,
+                    routing.identifier,
+                    dialogLauncher,
+                    dialogToTestOverlay
+                )
             }
         }
 }
diff --git a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherTransitionHandler.kt b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherTransitionHandler.kt
index 5552fc422..bd78ef0ae 100644
--- a/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherTransitionHandler.kt
+++ b/sandbox/src/main/java/com/badoo/ribs/sandbox/rib/switcher/routing/SwitcherTransitionHandler.kt
@@ -10,35 +10,36 @@ import com.badoo.ribs.routing.transition.handler.TransitionHandler
 import com.badoo.ribs.sandbox.R
 
 @SuppressWarnings("MagicNumber")
-class SwitcherTransitionHandler(duration: Long): TransitionHandler.Multiple<SwitcherRouter.Configuration>(
-    listOf<TransitionHandler<SwitcherRouter.Configuration>>(
+class SwitcherTransitionHandler(duration: Long) :
+    TransitionHandler.Multiple<SwitcherRouter.Configuration>(
+        listOf(
 
-        TabSwitcher(
-            animationContainer = AnimationContainer.RootView,
-            duration = duration,
-            tabsOrder = listOf(
-                SwitcherRouter.Configuration.Content.Hello,
-                SwitcherRouter.Configuration.Content.Foo,
-                SwitcherRouter.Configuration.Content.DialogsExample,
-                SwitcherRouter.Configuration.Content.Compose
-            )
-        ),
+            TabSwitcher(
+                animationContainer = AnimationContainer.RootView,
+                duration = duration,
+                tabsOrder = listOf(
+                    SwitcherRouter.Configuration.Content.Hello,
+                    SwitcherRouter.Configuration.Content.Foo,
+                    SwitcherRouter.Configuration.Content.DialogsExample,
+                    SwitcherRouter.Configuration.Content.Compose
+                )
+            ),
 
-        SharedElements(
-            params = listOf(
-                SharedElementTransition.Params(
-                    duration = duration,
-                    findExitingElement = { it.findViewById(R.id.sharedElementSquare) },
-                    findEnteringElement = { it.findViewById(R.id.sharedElementSquare) },
-                    translateXInterpolator = OvershootInterpolator(),
-                    translateYInterpolator = OvershootInterpolator(14f),
-                    rotation = SharedElementTransition.RotationParams(0.75f * 360)
+            SharedElements(
+                params = listOf(
+                    SharedElementTransition.Params(
+                        duration = duration,
+                        findExitingElement = { it.findViewById(R.id.sharedElementSquare) },
+                        findEnteringElement = { it.findViewById(R.id.sharedElementSquare) },
+                        translateXInterpolator = OvershootInterpolator(),
+                        translateYInterpolator = OvershootInterpolator(14f),
+                        rotation = SharedElementTransition.RotationParams(0.75f * 360)
+                    )
                 )
-            )
-        ),
+            ),
 
-        CrossFader(
-            duration = duration
+            CrossFader(
+                duration = duration
+            )
         )
     )
-)
diff --git a/sandbox/src/main/res/layout/activity_other.xml b/sandbox/src/main/res/layout/activity_other.xml
index 71fb76d64..ce3a8b95c 100644
--- a/sandbox/src/main/res/layout/activity_other.xml
+++ b/sandbox/src/main/res/layout/activity_other.xml
@@ -29,33 +29,33 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="48dp"
-            app:layout_constraintTop_toTopOf="parent"
+            android:text="@string/activity_other_incoming_title"
             app:layout_constraintBottom_toTopOf="@id/incoming_data"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            android:text="@string/activity_other_incoming_title"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
 
         <TextView
             android:id="@+id/incoming_data"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="48dp"
-            app:layout_constraintTop_toBottomOf="@+id/incoming_title"
             app:layout_constraintBottom_toTopOf="@+id/other_activity_misc"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/incoming_title" />
 
         <TextView
             android:id="@+id/other_activity_misc"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="48dp"
-            app:layout_constraintTop_toBottomOf="@+id/incoming_data"
+            android:text="@string/activity_other_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:text="@string/activity_other_content"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/incoming_data" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/sandbox/src/main/res/layout/activity_root.xml b/sandbox/src/main/res/layout/activity_root.xml
index eb5b08cb0..9aba5b9ed 100644
--- a/sandbox/src/main/res/layout/activity_root.xml
+++ b/sandbox/src/main/res/layout/activity_root.xml
@@ -21,7 +21,7 @@
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true" >
+            android:fillViewport="true">
 
             <LinearLayout
                 android:id="@+id/debug_controls_host"
diff --git a/sandbox/src/main/res/layout/debug_helloworld.xml b/sandbox/src/main/res/layout/debug_helloworld.xml
index fe6fbe864..5aecfa0d2 100644
--- a/sandbox/src/main/res/layout/debug_helloworld.xml
+++ b/sandbox/src/main/res/layout/debug_helloworld.xml
@@ -3,11 +3,11 @@
     android:id="@+id/debug_helloworld"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="24dp"
-    android:orientation="horizontal"
     android:layout_gravity="center"
     android:background="#797"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="24dp">
 
     <Button
         android:id="@+id/workflow_hello"
diff --git a/sandbox/src/main/res/layout/debug_switcher.xml b/sandbox/src/main/res/layout/debug_switcher.xml
index 664ce53b1..00a92fb82 100644
--- a/sandbox/src/main/res/layout/debug_switcher.xml
+++ b/sandbox/src/main/res/layout/debug_switcher.xml
@@ -3,11 +3,11 @@
     android:id="@+id/debug_switcher"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="24dp"
-    android:orientation="vertical"
     android:layout_gravity="top"
+    android:background="#799"
     android:gravity="top"
-    android:background="#799">
+    android:orientation="vertical"
+    android:padding="24dp">
 
     <Button
         android:id="@+id/workflow_hello"
diff --git a/sandbox/src/main/res/layout/rib_big.xml b/sandbox/src/main/res/layout/rib_big.xml
index 9777be10e..0cadc9e1e 100644
--- a/sandbox/src/main/res/layout/rib_big.xml
+++ b/sandbox/src/main/res/layout/rib_big.xml
@@ -3,9 +3,9 @@
     android:id="@+id/rib_big"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:layout_gravity="center"
-    android:gravity="center">
+    android:gravity="center"
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/sandbox/src/main/res/layout/rib_blocker.xml b/sandbox/src/main/res/layout/rib_blocker.xml
index b40c21245..1844bd627 100644
--- a/sandbox/src/main/res/layout/rib_blocker.xml
+++ b/sandbox/src/main/res/layout/rib_blocker.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_blocker"
     android:layout_width="match_parent"
@@ -11,22 +10,22 @@
         android:id="@+id/blocker_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="BLOCKER"
         android:layout_margin="16dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:text="BLOCKER"
         app:layout_constraintBottom_toTopOf="@+id/blocker_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <Button
         android:id="@+id/blocker_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/blocker_text"
+        android:text="@string/close"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:text="@string/close"/>
+        app:layout_constraintTop_toBottomOf="@+id/blocker_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_dialog_example.xml b/sandbox/src/main/res/layout/rib_dialog_example.xml
index 39111489a..269420db6 100644
--- a/sandbox/src/main/res/layout/rib_dialog_example.xml
+++ b/sandbox/src/main/res/layout/rib_dialog_example.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_dialog_example"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/dialogs_example_debug"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textStyle="bold"
         android:layout_margin="24dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/show_themed_dialog"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="3826750182" />
 
@@ -25,49 +24,49 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/show_simple_dialog"
-        app:layout_constraintTop_toBottomOf="@id/show_themed_dialog"
         app:layout_constraintBottom_toTopOf="@id/show_lazy_dialog"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/show_themed_dialog" />
 
     <Button
         android:id="@+id/show_themed_dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/show_themed_dialog"
-        app:layout_constraintTop_toBottomOf="@id/dialogs_example_debug"
         app:layout_constraintBottom_toTopOf="@id/show_simple_dialog"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/dialogs_example_debug" />
 
     <Button
         android:id="@+id/show_lazy_dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/show_lazy_dialog"
-        app:layout_constraintTop_toBottomOf="@id/show_simple_dialog"
         app:layout_constraintBottom_toTopOf="@id/show_rib_dialog"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/show_simple_dialog" />
 
     <Button
         android:id="@+id/show_rib_dialog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/show_rib_dialog"
-        app:layout_constraintTop_toBottomOf="@id/show_lazy_dialog"
         app:layout_constraintBottom_toTopOf="@id/up_navigation"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/show_lazy_dialog" />
 
     <Button
         android:id="@+id/up_navigation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/up_navigation"
-        app:layout_constraintTop_toBottomOf="@id/show_rib_dialog"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/show_rib_dialog" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_foobar.xml b/sandbox/src/main/res/layout/rib_foobar.xml
index 985a783a7..31274fb13 100644
--- a/sandbox/src/main/res/layout/rib_foobar.xml
+++ b/sandbox/src/main/res/layout/rib_foobar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_foobar"
@@ -13,10 +12,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Let's have a drink in the Foo Bar!"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/foobar_debug"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -25,32 +24,32 @@
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/foobar_title"
         app:layout_constraintBottom_toTopOf="@id/foobar_button_check_permissions"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/foobar_title"
         tools:text="3826750182" />
 
     <Button
         android:id="@+id/foobar_button_check_permissions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/check_permissions"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/foobar_debug"
+        android:text="@string/check_permissions"
         app:layout_constraintBottom_toTopOf="@id/foobar_button_request_permissions"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/foobar_debug" />
 
     <Button
         android:id="@+id/foobar_button_request_permissions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/request_permissions"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/foobar_button_check_permissions"
+        android:text="@string/request_permissions"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/foobar_button_check_permissions" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_foobar_override.xml b/sandbox/src/main/res/layout/rib_foobar_override.xml
index e3f8248dc..f809f409f 100644
--- a/sandbox/src/main/res/layout/rib_foobar_override.xml
+++ b/sandbox/src/main/res/layout/rib_foobar_override.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_foobar_override"
@@ -14,8 +13,8 @@
         android:layout_height="112dp"
         android:layout_margin="16dp"
         android:background="@color/colorAccent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/foobar_title"
@@ -23,10 +22,10 @@
         android:layout_height="wrap_content"
         android:text="Let's have a drink in the Foo Bar!\n(Overridden layout)"
         android:textAlignment="center"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/foobar_debug"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -35,32 +34,32 @@
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/foobar_title"
         app:layout_constraintBottom_toTopOf="@id/foobar_button_check_permissions"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/foobar_title"
         tools:text="3826750182" />
 
     <Button
         android:id="@+id/foobar_button_check_permissions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/check_permissions"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/foobar_debug"
+        android:text="@string/check_permissions"
         app:layout_constraintBottom_toTopOf="@id/foobar_button_request_permissions"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/foobar_debug" />
 
     <Button
         android:id="@+id/foobar_button_request_permissions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/request_permissions"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/foobar_button_check_permissions"
+        android:text="@string/request_permissions"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/foobar_button_check_permissions" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_hello_world.xml b/sandbox/src/main/res/layout/rib_hello_world.xml
index 8d6542b47..7b0ce5e1c 100644
--- a/sandbox/src/main/res/layout/rib_hello_world.xml
+++ b/sandbox/src/main/res/layout/rib_hello_world.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_hello_world"
@@ -13,21 +12,21 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginBottom="16dp"
-        android:transitionName="bla"
         android:background="@color/colorAccent"
+        android:transitionName="bla"
         app:layout_constraintBottom_toTopOf="@id/hello_title"
-        app:layout_constraintStart_toStartOf="@id/hello_title"
-        app:layout_constraintEnd_toEndOf="@id/hello_title" />
+        app:layout_constraintEnd_toEndOf="@id/hello_title"
+        app:layout_constraintStart_toStartOf="@id/hello_title" />
 
     <TextView
         android:id="@+id/hello_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/hello_debug"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -36,31 +35,31 @@
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/hello_title"
         app:layout_constraintBottom_toTopOf="@id/hello_button_launch"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/hello_title"
         tools:text="3826750182" />
 
     <Button
         android:id="@+id/hello_button_launch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/launch_other_activity"
         android:layout_margin="24dp"
-        app:layout_constraintTop_toBottomOf="@id/hello_debug"
+        android:text="@string/launch_other_activity"
         app:layout_constraintBottom_toTopOf="@id/small_container"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/hello_debug" />
 
     <FrameLayout
         android:id="@+id/small_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        app:layout_constraintTop_toBottomOf="@id/hello_button_launch"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/hello_button_launch" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_hello_world_doc.xml b/sandbox/src/main/res/layout/rib_hello_world_doc.xml
index c9dc56a6f..1085b18bc 100644
--- a/sandbox/src/main/res/layout/rib_hello_world_doc.xml
+++ b/sandbox/src/main/res/layout/rib_hello_world_doc.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rib_hello_world"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/sandbox/src/main/res/layout/rib_lorem_ipsum.xml b/sandbox/src/main/res/layout/rib_lorem_ipsum.xml
index e856e4834..61094f31f 100644
--- a/sandbox/src/main/res/layout/rib_lorem_ipsum.xml
+++ b/sandbox/src/main/res/layout/rib_lorem_ipsum.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_lorem_ipsum"
     android:layout_width="match_parent"
@@ -11,23 +10,23 @@
         android:id="@+id/lorem_ipsum_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:text="Lorem ipsum RIB\n(default layout)"
         android:textAlignment="center"
-        android:layout_margin="16dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/lorem_ipsum_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <Button
         android:id="@+id/lorem_ipsum_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/lorem_ipsum_text"
+        android:text="@string/random_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:text="@string/random_button"/>
+        app:layout_constraintTop_toBottomOf="@+id/lorem_ipsum_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_lorem_ipsum_override.xml b/sandbox/src/main/res/layout/rib_lorem_ipsum_override.xml
index a1178bb0b..230548b66 100644
--- a/sandbox/src/main/res/layout/rib_lorem_ipsum_override.xml
+++ b/sandbox/src/main/res/layout/rib_lorem_ipsum_override.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_lorem_ipsum_override"
     android:layout_width="match_parent"
@@ -11,24 +10,24 @@
         android:id="@+id/lorem_ipsum_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="16dp"
         android:text="Lorem ipsum RIB\n(customisation override)"
         android:textAlignment="center"
         android:textColor="@color/colorPrimary"
-        android:layout_margin="16dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/lorem_ipsum_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <Button
         android:id="@+id/lorem_ipsum_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/lorem_ipsum_text"
+        android:text="@string/random_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:text="@string/random_button"/>
+        app:layout_constraintTop_toBottomOf="@+id/lorem_ipsum_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_menu.xml b/sandbox/src/main/res/layout/rib_menu.xml
index 4cbc1d984..ec8968ff5 100644
--- a/sandbox/src/main/res/layout/rib_menu.xml
+++ b/sandbox/src/main/res/layout/rib_menu.xml
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rib_menu"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:background="#ccd">
+    android:background="#ccd"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/menu_hello"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        android:textStyle="bold"
+        android:layout_weight="1"
         android:gravity="center"
-        android:text="Hello" />
+        android:padding="8dp"
+        android:text="Hello"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/menu_foo"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        android:textStyle="bold"
+        android:layout_weight="1"
         android:gravity="center"
-        android:text="Foo" />
+        android:padding="8dp"
+        android:text="Foo"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/menu_dialogs"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        android:textStyle="bold"
+        android:layout_weight="1"
         android:gravity="center"
-        android:text="Dialogs" />
+        android:padding="8dp"
+        android:text="Dialogs"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/menu_compose"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        android:textStyle="bold"
+        android:layout_weight="1"
         android:gravity="center"
-        android:text="Compose" />
+        android:padding="8dp"
+        android:text="Compose"
+        android:textStyle="bold" />
 
 </LinearLayout>
diff --git a/sandbox/src/main/res/layout/rib_portal_overlay_test.xml b/sandbox/src/main/res/layout/rib_portal_overlay_test.xml
index 6b473ab31..d1e08cb0e 100644
--- a/sandbox/src/main/res/layout/rib_portal_overlay_test.xml
+++ b/sandbox/src/main/res/layout/rib_portal_overlay_test.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rib_portal_overlay_test"
     android:layout_width="match_parent"
@@ -14,9 +13,9 @@
         android:layout_height="wrap_content"
         android:text="Portal overlay test"
         android:textColor="#ffffff"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sandbox/src/main/res/layout/rib_small.xml b/sandbox/src/main/res/layout/rib_small.xml
index 3e7082544..7a065b4b9 100644
--- a/sandbox/src/main/res/layout/rib_small.xml
+++ b/sandbox/src/main/res/layout/rib_small.xml
@@ -3,27 +3,27 @@
     android:id="@+id/rib_small"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_gravity="center"
     android:background="#999"
-    android:padding="24dp"
+    android:gravity="center"
     android:orientation="vertical"
-    android:layout_gravity="center"
-    android:gravity="center">
+    android:padding="24dp">
 
     <TextView
         android:id="@+id/small_id"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <Button
         android:id="@+id/open_big"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Open Big"/>
+        android:text="Open Big" />
 
     <Button
         android:id="@+id/open_overlay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Open Overlay"/>
+        android:text="Open Overlay" />
 
 </LinearLayout>
diff --git a/sandbox/src/main/res/layout/rib_switcher.xml b/sandbox/src/main/res/layout/rib_switcher.xml
index 2a6e3b42c..8a04071a2 100644
--- a/sandbox/src/main/res/layout/rib_switcher.xml
+++ b/sandbox/src/main/res/layout/rib_switcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rib_switcher"
@@ -16,13 +15,13 @@
             android:id="@+id/controls_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:background="#eee"
             android:padding="16dp"
-            app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/content_container"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="gone"
-            android:background="#eee">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <Button
                 android:id="@+id/show_overlay_dialog"
@@ -51,19 +50,19 @@
             android:id="@+id/content_container"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@+id/controls_container"
             app:layout_constraintBottom_toTopOf="@id/menu_container"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/controls_container" />
 
         <FrameLayout
             android:id="@+id/menu_container"
             android:layout_width="0dp"
             android:layout_height="50dp"
-            app:layout_constraintTop_toBottomOf="@id/content_container"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/content_container" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleRouterTest.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleRouterTest.kt
index 5a7b14385..df8f34bd5 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleRouterTest.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/dialog_example/DialogExampleRouterTest.kt
@@ -3,14 +3,13 @@ package com.badoo.ribs.sandbox.rib.dialog_example
 import com.badoo.ribs.routing.source.impl.Empty
 import com.badoo.ribs.sandbox.rib.dialog_example.routing.DialogExampleRouter
 import com.badoo.ribs.test.emptyBuildParams
-import org.mockito.kotlin.mock
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
 import org.robolectric.RobolectricTestRunner
 
-
 @RunWith(RobolectricTestRunner::class)
 class DialogExampleRouterTest {
 
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractorTest.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractorTest.kt
index 050d17315..ab4ac8ac3 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractorTest.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/foo_bar/FooBarInteractorTest.kt
@@ -2,10 +2,10 @@ package com.badoo.ribs.sandbox.rib.foo_bar
 
 import com.badoo.ribs.android.permissionrequester.PermissionRequester
 import com.badoo.ribs.test.emptyBuildParams
-import org.mockito.kotlin.mock
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class FooBarInteractorTest {
 
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/menu/MenuRibTest.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/menu/MenuRibTest.kt
index 57c35de1c..65dcf274b 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/menu/MenuRibTest.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/menu/MenuRibTest.kt
@@ -12,12 +12,12 @@ import com.badoo.ribs.sandbox.rib.menu.Menu.Output.MenuItemSelected
 import com.badoo.ribs.sandbox.rib.menu.MenuView.Event.Select
 import com.badoo.ribs.sandbox.rib.util.TestView
 import com.badoo.ribs.sandbox.rib.util.subscribeOnTestObserver
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 import org.robolectric.RobolectricTestRunner
 
 /**
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractorTest.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractorTest.kt
index c13cf824f..c0dd6e0d0 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractorTest.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherInteractorTest.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.sandbox.rib.switcher
 
 import androidx.lifecycle.Lifecycle.State.CREATED
 import androidx.lifecycle.Lifecycle.State.STARTED
-import com.badoo.common.ribs.rx2.createInteractorTestHelper
+import com.badoo.common.ribs.rx3.createInteractorTestHelper
 import com.badoo.ribs.routing.router.Router.TransitionState.SETTLED
 import com.badoo.ribs.routing.source.backstack.BackStack
 import com.badoo.ribs.routing.source.backstack.operation.push
@@ -14,8 +14,8 @@ import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Overlay
 import com.badoo.ribs.test.InteractorTestHelper
 import com.badoo.ribs.test.emptyBuildParams
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.Observable
+import com.jakewharton.rxrelay3.PublishRelay
+import io.reactivex.rxjava3.core.Observable
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherRouterTest.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherRouterTest.kt
index 06a524f95..8d7ec6961 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherRouterTest.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/switcher/SwitcherRouterTest.kt
@@ -12,15 +12,15 @@ import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Overlay
 import com.badoo.ribs.sandbox.rib.switcher.routing.SwitcherRouter.Configuration.Permanent
 import com.badoo.ribs.test.emptyBuildParams
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Answers
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Answers
 
 /**
  * Unit tests that check only router
@@ -53,7 +53,8 @@ class SwitcherRouterTest {
 
     @Test
     fun `Permanent_Menu configuration resolves to correct Node`() {
-        val routingAction = router.resolve(Routing(configuration = Permanent.Menu)).apply { execute() }
+        val routingAction =
+            router.resolve(Routing(configuration = Permanent.Menu)).apply { execute() }
         routingAction.buildNodes(listOf(root(null)))
 
         verify(builders.menu).build(any())
@@ -61,7 +62,8 @@ class SwitcherRouterTest {
 
     @Test
     fun `Content_Hello configuration resolves to correct Node`() {
-        val routingAction = router.resolve(Routing(configuration = Content.Hello)).apply { execute() }
+        val routingAction =
+            router.resolve(Routing(configuration = Content.Hello)).apply { execute() }
         routingAction.buildNodes(listOf(root(null)))
 
         verify(builders.helloWorld).build(any())
@@ -77,7 +79,8 @@ class SwitcherRouterTest {
 
     @Test
     fun `Content_DialogsExample configuration resolves to correct Node`() {
-        val routingAction = router.resolve(Routing(configuration = Content.DialogsExample)).apply { execute() }
+        val routingAction =
+            router.resolve(Routing(configuration = Content.DialogsExample)).apply { execute() }
         routingAction.buildNodes(listOf(root(null)))
 
         verify(builders.dialogExample).build(any())
@@ -85,7 +88,8 @@ class SwitcherRouterTest {
 
     @Test
     fun `Content_Blocker configuration resolves to correct Node`() {
-        val routingAction = router.resolve(Routing(configuration = Content.Blocker)).apply { execute() }
+        val routingAction =
+            router.resolve(Routing(configuration = Content.Blocker)).apply { execute() }
         routingAction.buildNodes(listOf(root(null)))
 
         verify(builders.blocker).build(any())
@@ -93,7 +97,8 @@ class SwitcherRouterTest {
 
     @Test
     fun `Overlay_Dialog configuration resolves to DialogRoutingAction`() {
-        val routingAction = router.resolve(Routing(configuration = Overlay.Dialog)).apply { execute() }
+        val routingAction =
+            router.resolve(Routing(configuration = Overlay.Dialog)).apply { execute() }
 
         assertThat(routingAction).isInstanceOf(DialogResolution::class.java)
     }
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/IntentMatchers.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/IntentMatchers.kt
index b9294ec36..22b501417 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/IntentMatchers.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/IntentMatchers.kt
@@ -3,8 +3,9 @@ package com.badoo.ribs.sandbox.rib.util
 import android.content.Intent
 import org.assertj.core.api.Condition
 
-inline fun <reified T> component(): Condition<Intent> = object : Condition<Intent>("has component with specified class") {
-    override fun matches(value: Intent?): Boolean {
-        return value?.component?.className == T::class.java.name
+inline fun <reified T> component(): Condition<Intent> =
+    object : Condition<Intent>("has component with specified class") {
+        override fun matches(value: Intent?): Boolean {
+            return value?.component?.className == T::class.java.name
+        }
     }
-}
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/RxExtensions.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/RxExtensions.kt
index 605191023..58baae6ab 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/RxExtensions.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/RxExtensions.kt
@@ -1,8 +1,8 @@
 package com.badoo.ribs.sandbox.rib.util
 
-import io.reactivex.ObservableSource
-import io.reactivex.observers.TestObserver
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.observers.TestObserver
 
-fun <T> ObservableSource<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
+fun <T : Any> ObservableSource<T>.subscribeOnTestObserver() = TestObserver<T>().apply {
     subscribe(this)
 }
\ No newline at end of file
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestActivityStarter.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestActivityStarter.kt
index 4b5202087..8b65e7900 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestActivityStarter.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestActivityStarter.kt
@@ -9,24 +9,29 @@ import com.badoo.ribs.minimal.reactive.Relay
 import com.badoo.ribs.minimal.reactive.Source
 import com.badoo.ribs.minimal.reactive.filter
 import com.badoo.ribs.minimal.reactive.map
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Condition
 import org.assertj.core.api.ListAssert
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
 
 class TestActivityStarter : ActivityStarter {
 
     private val intents: MutableList<Intent> = mutableListOf()
     private val responses: MutableList<Pair<Condition<Intent>, ActivityResult>> = mutableListOf()
 
-    private val eventsRelay: Relay<Pair<RequestCodeClient, ActivityStarter.ActivityResultEvent>> = Relay()
+    private val eventsRelay: Relay<Pair<RequestCodeClient, ActivityStarter.ActivityResultEvent>> =
+        Relay()
 
     override fun startActivity(createIntent: Context.() -> Intent) {
         intents += testContext.createIntent()
     }
 
-    override fun startActivityForResult(client: RequestCodeClient, requestCode: Int, createIntent: Context.() -> Intent) {
+    override fun startActivityForResult(
+        client: RequestCodeClient,
+        requestCode: Int,
+        createIntent: Context.() -> Intent
+    ) {
         val intent = testContext.createIntent()
 
         intents += intent
@@ -35,7 +40,13 @@ class TestActivityStarter : ActivityStarter {
             matcher.matches(intent)
         }?.second ?: throw IllegalStateException("No response found for intent $intent")
 
-        eventsRelay.emit(client to ActivityStarter.ActivityResultEvent(requestCode, result.resultCode, result.resultData))
+        eventsRelay.emit(
+            client to ActivityStarter.ActivityResultEvent(
+                requestCode,
+                result.resultCode,
+                result.resultData
+            )
+        )
     }
 
     override fun events(client: RequestCodeClient): Source<ActivityStarter.ActivityResultEvent> =
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestPermissionRequester.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestPermissionRequester.kt
index db2888aa5..3de6f4143 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestPermissionRequester.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestPermissionRequester.kt
@@ -7,11 +7,18 @@ import com.badoo.ribs.minimal.reactive.Source
 
 class TestPermissionRequester : PermissionRequester {
 
-    override fun checkPermissions(client: RequestCodeClient, permissions: Array<String>): PermissionRequester.CheckPermissionsResult {
+    override fun checkPermissions(
+        client: RequestCodeClient,
+        permissions: Array<String>
+    ): PermissionRequester.CheckPermissionsResult {
         TODO()
     }
 
-    override fun requestPermissions(client: RequestCodeClient, requestCode: Int, permissions: Array<String>) {
+    override fun requestPermissions(
+        client: RequestCodeClient,
+        requestCode: Int,
+        permissions: Array<String>
+    ) {
         TODO()
     }
 
diff --git a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestView.kt b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestView.kt
index 1de172cd2..de077ee59 100644
--- a/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestView.kt
+++ b/sandbox/src/test/java/com/badoo/ribs/sandbox/rib/util/TestView.kt
@@ -3,16 +3,16 @@ package com.badoo.ribs.sandbox.rib.util
 import android.view.ViewGroup
 import com.badoo.ribs.core.view.AndroidRibView
 import com.badoo.ribs.core.view.RibView
-import com.jakewharton.rxrelay2.PublishRelay
-import com.jakewharton.rxrelay2.Relay
+import com.jakewharton.rxrelay3.PublishRelay
+import com.jakewharton.rxrelay3.Relay
+import io.reactivex.rxjava3.core.ObservableSource
+import io.reactivex.rxjava3.functions.Consumer
 import org.mockito.kotlin.mock
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
 
-abstract class TestView<M, E>(
+abstract class TestView<M : Any, E : Any>(
     override val androidView: ViewGroup = mock(),
-    private val _viewModel: Relay<M> = PublishRelay.create<M>(),
-    private val _uiEvents: Relay<E> = PublishRelay.create<E>()
+    private val _viewModel: Relay<M> = PublishRelay.create(),
+    private val _uiEvents: Relay<E> = PublishRelay.create()
 ) : AndroidRibView(),
     RibView,
     Consumer<M> by _viewModel, ObservableSource<E> by _uiEvents {
diff --git a/settings.gradle b/settings.gradle
index 1726f19ab..232eabf18 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,13 +3,13 @@ include ':internal:junitextensions'
 include ':libraries:rib-base'
 include ':libraries:rib-base-test'
 include ':libraries:rib-base-test-activity'
-include ':libraries:rib-base-test-rx2'
+include ':libraries:rib-base-test-rx3'
 include ':libraries:rib-compose'
 include ':libraries:rib-debug-utils'
 include ':libraries:rib-mvicore'
 include ':libraries:rib-portal'
-include ':libraries:rib-portal-rx2'
-include ':libraries:rib-rx2'
+include ':libraries:rib-portal-rx3'
+include ':libraries:rib-rx3'
 
 include ':samples:app:hello-world'
 include ':samples:app:customisations-demo'