diff --git a/.github/workflows/android-spotless.yml b/.github/workflows/android-spotless.yml
index eb30b54a..d821bdf2 100644
--- a/.github/workflows/android-spotless.yml
+++ b/.github/workflows/android-spotless.yml
@@ -7,6 +7,9 @@ on:
     branches:
       - '*'
 
+env:
+  CI: "true"
+
 jobs:
   android-spotless:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml
index 03ea2e6f..eb84846e 100644
--- a/.github/workflows/android-test.yml
+++ b/.github/workflows/android-test.yml
@@ -7,6 +7,9 @@ on:
     branches:
       - develop
 
+env:
+  CI: "true"
+
 jobs:
   android-unit-test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/gradle-dokka.yml b/.github/workflows/gradle-dokka.yml
index eff4337a..4ae89518 100644
--- a/.github/workflows/gradle-dokka.yml
+++ b/.github/workflows/gradle-dokka.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches: [ develop ]
 
+env:
+  CI: "true"
+
 jobs:
   gradle-dokka:
     runs-on: ubuntu-latest
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 00000000..e7629756
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb2afa06..5252b21d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -20,6 +20,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/library" />
           </set>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7b13c3df..a79e6df0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,10 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/retrofit-graphql.iml" filepath="$PROJECT_DIR$/.idea/modules/retrofit-graphql.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/retrofit-graphql.app.unitTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/buildSrc/retrofit-graphql.buildSrc.iml" filepath="$PROJECT_DIR$/.idea/modules/buildSrc/retrofit-graphql.buildSrc.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/retrofit-graphql.buildSrc.main.iml" filepath="$PROJECT_DIR$/.idea/modules/retrofit-graphql.buildSrc.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/retrofit-graphql.buildSrc.test.iml" filepath="$PROJECT_DIR$/.idea/modules/retrofit-graphql.buildSrc.test.iml" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7b712422..57d6d2dd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,9 +39,13 @@ dependencies {
     implementation(libs.androidx.recycler.view)
 
     implementation(libs.androidx.lifecycle.livedata.core)
+    implementation(libs.androidx.lifecycle.livedata.core.ktx)
+    implementation(libs.androidx.lifecycle.livedata)
     implementation(libs.androidx.lifecycle.livedata.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
     implementation(libs.androidx.lifecycle.extensions)
+    implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.runtime.ktx)
 
     implementation(libs.androidx.paging.common)
@@ -53,17 +57,29 @@ dependencies {
     kapt(libs.androidx.room.compiler)
 
     implementation(libs.anitrend.arch.ui)
-    implementation(libs.anitrend.arch.ext)
+    implementation(libs.anitrend.arch.extension)
+    implementation(libs.anitrend.arch.analytics)
     implementation(libs.anitrend.arch.core)
     implementation(libs.anitrend.arch.data)
     implementation(libs.anitrend.arch.theme)
     implementation(libs.anitrend.arch.domain)
     implementation(libs.anitrend.arch.recycler)
+    implementation(libs.anitrend.arch.request)
+    implementation(libs.anitrend.arch.paging.legacy)
+    implementation(libs.anitrend.arch.recycler.paging.legacy)
+
     implementation(libs.anitrend.emojify)
+    implementation(libs.anitrend.emojify.contract)
+    implementation(libs.anitrend.emojify.kotlinx)
 
     implementation(libs.coil)
     implementation(libs.coil.gif)
 
+    implementation(libs.square.retrofit)
+    implementation(libs.square.okhttp)
+    implementation(libs.square.okhttp.logger)
+
+
     implementation(libs.timber)
 
     releaseImplementation(libs.chuncker.release)
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/extension/CoreExt.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/extension/CoreExt.kt
index 10a54038..45cd6491 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/extension/CoreExt.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/extension/CoreExt.kt
@@ -56,7 +56,7 @@ inline fun FragmentManager.commit(
         return fragmentTag
     }
 
-    Timber.tag(javaClass.simpleName).v("FragmentItem model is null")
+    Timber.v("FragmentItem model is null")
     return null
 }
 
@@ -70,7 +70,6 @@ fun SupportImageView.using(
 ): Disposable {
     return load(imageUrl) {
         placeholder(placeHolder)
-        transition(CrossfadeTransition(350))
         transformations(transformations.toList())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/logger/KoinLogger.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/logger/KoinLogger.kt
index 5b849067..d0c07d90 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/logger/KoinLogger.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/logger/KoinLogger.kt
@@ -1,6 +1,5 @@
 package co.anitrend.retrofit.graphql.core.helpers.logger
 
-import org.koin.core.logger.KOIN_TAG
 import org.koin.core.logger.Level
 import org.koin.core.logger.Logger
 import org.koin.core.logger.MESSAGE
@@ -12,13 +11,13 @@ import timber.log.Timber
 internal class KoinLogger(
     logLevel: Level
 ) : Logger(logLevel) {
-
-    override fun log(level: Level, msg: MESSAGE) {
+    override fun display(level: Level, msg: MESSAGE) {
         when (level) {
-            Level.DEBUG -> Timber.tag(KOIN_TAG).d(msg)
-            Level.INFO -> Timber.tag(KOIN_TAG).i(msg)
-            Level.ERROR -> Timber.tag(KOIN_TAG).e(msg)
-            Level.NONE -> Timber.tag(KOIN_TAG).v(msg)
+            Level.DEBUG -> Timber.d(msg)
+            Level.INFO -> Timber.i(msg)
+            Level.ERROR -> Timber.e(msg)
+            Level.NONE -> {}
+            Level.WARNING -> Timber.w(msg)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/runtime/UncaughtExceptionHandler.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/runtime/UncaughtExceptionHandler.kt
index cda7cc73..7e1261b9 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/runtime/UncaughtExceptionHandler.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/helpers/runtime/UncaughtExceptionHandler.kt
@@ -18,7 +18,7 @@ internal class UncaughtExceptionHandler(
      * @param throwable the exception
      */
     override fun uncaughtException(thread: Thread, throwable: Throwable) {
-        Timber.tag(thread.name).e(throwable)
+        Timber.e(throwable)
         exceptionHandler?.uncaughtException(thread, throwable)
     }
 
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/koin/CoreModules.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/koin/CoreModules.kt
index eb78ff44..3fb57272 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/koin/CoreModules.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/koin/CoreModules.kt
@@ -1,14 +1,10 @@
 package co.anitrend.retrofit.graphql.core.koin
 
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.P
 import co.anitrend.arch.extension.dispatchers.SupportDispatchers
 import co.anitrend.retrofit.graphql.core.settings.Settings
 import coil.ImageLoader
 import coil.ImageLoaderFactory
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.util.CoilUtils
+import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.android.ext.koin.androidApplication
@@ -41,27 +37,18 @@ private val coilModules = module {
                 }
             )
             .cache(
-                CoilUtils.createDefaultCache(
-                    androidApplication()
-                )
+                Cache(androidApplication().cacheDir, 50 * 1024 * 1024)
             ).build()
     }
     factory<ImageLoaderFactory> {
-        object : ImageLoaderFactory {
-            override fun newImageLoader(): ImageLoader {
-                return ImageLoader.Builder(androidContext())
-                    .crossfade(true)
-                    .allowHardware(true)
-                    .bitmapPoolPercentage(0.35)
-                    .okHttpClient {
-                        get(named("coilOkHttp"))
-                    }
-                    .componentRegistry {
-                        if (SDK_INT >= P) add(ImageDecoderDecoder())
-                        else add(GifDecoder())
-                    }
-                    .build()
-            }
+        ImageLoaderFactory {
+            ImageLoader.Builder(androidContext())
+                .crossfade(true)
+                .allowHardware(true)
+                .okHttpClient {
+                    get(named("coilOkHttp"))
+                }
+                .build()
         }
     }
 }
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/view/SampleActivity.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/view/SampleActivity.kt
index 18fa43f6..ba2f5e47 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/view/SampleActivity.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/core/view/SampleActivity.kt
@@ -15,7 +15,7 @@ abstract class SampleActivity : SupportActivity() {
      * Can be used to configure custom theme styling as desired
      */
     override fun configureActivity() {
-        setupKoinFragmentFactory(koinLifecycleScope)
+        setupKoinFragmentFactory()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val systemUiOptions = window.decorView.systemUiVisibility
             when (AppCompatDelegate.getDefaultNightMode()) {
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/api/provider/RetrofitProvider.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/api/provider/RetrofitProvider.kt
index 04376709..accec74d 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/api/provider/RetrofitProvider.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/api/provider/RetrofitProvider.kt
@@ -34,7 +34,7 @@ internal object RetrofitProvider {
         when (endpointType) {
             EndpointType.BUCKET,
             EndpointType.GITHUB -> {
-                Timber.tag(moduleTag).d("""
+                Timber.d("""
                     Adding request interceptors for endpoint: ${endpointType.name}
                     """.trimIndent()
                 )
@@ -66,13 +66,13 @@ internal object RetrofitProvider {
     fun provideRetrofit(endpointType: EndpointType, scope: Scope): Retrofit {
         val reference = retrofitCache.get(endpointType)
         return if (reference != null) {
-            Timber.tag(moduleTag).d(
+            Timber.d(
                 "Using cached retrofit instance for endpoint: ${endpointType.name}"
             )
             reference
         }
         else {
-            Timber.tag(moduleTag).d(
+            Timber.d(
                 "Creating new retrofit instance for endpoint: ${endpointType.name}"
             )
             val retrofit =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OfflineControllerPolicy.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OfflineControllerPolicy.kt
index bec36660..c0d76c31 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OfflineControllerPolicy.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OfflineControllerPolicy.kt
@@ -43,7 +43,7 @@ internal class OfflineControllerPolicy<D> private constructor() : ControllerStra
             block()
             pagingRequestHelper.recordSuccess()
         }.exceptionOrNull()?.also { e ->
-            Timber.tag(moduleTag).e(e)
+            Timber.e(e)
             pagingRequestHelper.recordFailure(e)
         }
     }
@@ -64,7 +64,7 @@ internal class OfflineControllerPolicy<D> private constructor() : ControllerStra
             networkState.postValue(NetworkState.Success)
             result
         }.getOrElse {
-            Timber.tag(moduleTag).e(it)
+            Timber.e(it)
             networkState.postValue(
                 NetworkState.Error(
                     heading = it.cause?.message ?: "Unexpected error encountered",
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OnlineControllerPolicy.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OnlineControllerPolicy.kt
index 96939ed9..a9bb2e73 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OnlineControllerPolicy.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/controller/policy/OnlineControllerPolicy.kt
@@ -30,7 +30,7 @@ internal class OnlineControllerPolicy<D> private constructor(
                 pagingRequestHelper.recordSuccess()
             }.exceptionOrNull()?.also { e ->
                 e.printStackTrace()
-                Timber.tag(moduleTag).e(e)
+                Timber.e(e)
                 pagingRequestHelper.recordFailure(e)
             }
         }
@@ -58,7 +58,7 @@ internal class OnlineControllerPolicy<D> private constructor(
                 networkState.postValue(NetworkState.Success)
                 result
             }.getOrElse {
-                Timber.tag(moduleTag).e(it)
+                Timber.e(it)
                 networkState.postValue(
                     NetworkState.Error(
                         heading = it.cause?.message ?: "Unexpected error encountered \uD83E\uDD2D",
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/mapper/GraphQLMapper.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/mapper/GraphQLMapper.kt
index 35e268fc..acee9cfd 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/mapper/GraphQLMapper.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/data/arch/mapper/GraphQLMapper.kt
@@ -16,7 +16,7 @@ internal abstract class GraphQLMapper<S, D> : SupportResponseMapper<S, D>() {
      * Simple logger for empty response
      */
     protected fun onEmptyResponse() {
-        Timber.tag(moduleTag).v(
+        Timber.v(
             "onResponseDatabaseInsert -> mappedData is empty"
         )
     }
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/BucketUseCase.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/BucketUseCase.kt
index b9b16c2b..426a13c0 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/BucketUseCase.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/BucketUseCase.kt
@@ -1,10 +1,10 @@
 package co.anitrend.retrofit.graphql.domain.usecases
 
 import co.anitrend.arch.domain.common.IUseCase
-import co.anitrend.arch.domain.common.IUserInterfaceState
+import co.anitrend.arch.domain.state.UiState
 import co.anitrend.retrofit.graphql.domain.repositories.BucketRepository
 
-abstract class BucketUseCase<R: IUserInterfaceState<*>>(
+abstract class BucketUseCase<R: UiState<*>>(
     protected val repository: BucketRepository<R>
 ) : IUseCase {
     operator fun invoke() =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/MarketPlaceUseCase.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/MarketPlaceUseCase.kt
index ea9b514d..cde64b1a 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/MarketPlaceUseCase.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/MarketPlaceUseCase.kt
@@ -1,10 +1,10 @@
 package co.anitrend.retrofit.graphql.domain.usecases
 
 import co.anitrend.arch.domain.common.IUseCase
-import co.anitrend.arch.domain.common.IUserInterfaceState
+import co.anitrend.arch.domain.state.UiState
 import co.anitrend.retrofit.graphql.domain.repositories.MarketPlaceRepository
 
-abstract class MarketPlaceUseCase<R: IUserInterfaceState<*>>(
+abstract class MarketPlaceUseCase<R: UiState<*>>(
     protected val repository: MarketPlaceRepository<R>
 ) : IUseCase {
     operator fun invoke() =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UploadUseCase.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UploadUseCase.kt
index e4952eb4..53cfe27f 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UploadUseCase.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UploadUseCase.kt
@@ -1,11 +1,11 @@
 package co.anitrend.retrofit.graphql.domain.usecases
 
 import co.anitrend.arch.domain.common.IUseCase
-import co.anitrend.arch.domain.common.IUserInterfaceState
+import co.anitrend.arch.domain.state.UiState
 import co.anitrend.retrofit.graphql.domain.models.common.IGraphQuery
 import co.anitrend.retrofit.graphql.domain.repositories.UploadRepository
 
-abstract class UploadUseCase<R: IUserInterfaceState<*>>(
+abstract class UploadUseCase<R: UiState<*>>(
     protected val repository: UploadRepository<R>
 ) : IUseCase {
     operator fun invoke(mutation: IGraphQuery) =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UserUseCase.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UserUseCase.kt
index 41ff6d54..1160c0f4 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UserUseCase.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/domain/usecases/UserUseCase.kt
@@ -1,10 +1,10 @@
 package co.anitrend.retrofit.graphql.domain.usecases
 
 import co.anitrend.arch.domain.common.IUseCase
-import co.anitrend.arch.domain.common.IUserInterfaceState
+import co.anitrend.arch.domain.state.UiState
 import co.anitrend.retrofit.graphql.domain.repositories.UserRepository
 
-abstract class UserUseCase<R: IUserInterfaceState<*>>(
+abstract class UserUseCase<R: UiState<*>>(
     protected val repository: UserRepository<R>
 ) : IUseCase {
     operator fun invoke() =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/App.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/App.kt
index 327bc566..e996f466 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/App.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/App.kt
@@ -1,10 +1,9 @@
 package co.anitrend.retrofit.graphql.sample
 
-import androidx.startup.AppInitializer
 import co.anitrend.retrofit.graphql.core.SampleApp
 import co.anitrend.retrofit.graphql.core.helpers.runtime.UncaughtExceptionHandler
 import io.wax911.emojify.EmojiManager
-import io.wax911.emojify.initializer.EmojiInitializer
+import io.wax911.emojify.serializer.kotlinx.KotlinxDeserializer
 
 class App : SampleApp() {
 
@@ -12,8 +11,7 @@ class App : SampleApp() {
      * Emoji manager instance
      */
     override val emojiManager: EmojiManager by lazy {
-        AppInitializer.getInstance(this)
-            .initializeComponent(EmojiInitializer::class.java)
+        EmojiManager.create(this, serializer = KotlinxDeserializer())
     }
 
     /**
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/CoilInitializer.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/CoilInitializer.kt
index 403a8c8e..030dbe05 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/CoilInitializer.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/CoilInitializer.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.startup.Initializer
 import coil.Coil
 import coil.ImageLoaderFactory
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 
 internal class CoilInitializer : Initializer<Unit> {
 
@@ -17,8 +17,7 @@ internal class CoilInitializer : Initializer<Unit> {
     override fun create(context: Context) {
         // I could just have koin component declared on the class level
         val component = object : KoinComponent {}
-        val factory =
-            component.get<ImageLoaderFactory>()
+        val factory = component.get<ImageLoaderFactory>()
         Coil.setImageLoader(factory)
     }
 
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/TimberInitializer.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/TimberInitializer.kt
index 8c0a47df..fc05b9ff 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/TimberInitializer.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/initializer/TimberInitializer.kt
@@ -1,44 +1,18 @@
 package co.anitrend.retrofit.graphql.sample.initializer
 
 import android.content.Context
-import android.util.Log
 import androidx.startup.Initializer
 import co.anitrend.retrofit.graphql.sample.BuildConfig
-import fr.bipi.tressence.file.FileLoggerTree
 import timber.log.Timber
-import java.io.File
-import java.io.IOException
 
 class TimberInitializer : Initializer<Unit> {
 
-    @Throws(SecurityException::class)
-    private fun getLogsCache(context: Context): File {
-        val cache = context.externalCacheDir ?: context.cacheDir
-        val logsName = "logs"
-        val logs = File(cache, logsName)
-        if (!logs.exists()) logs.mkdirs()
-        return logs
-    }
-
-    @Throws(IOException::class)
-    private fun createFileLoggingTree(context: Context) =
-        FileLoggerTree.Builder()
-            .withFileName("${context.packageName}.log")
-            .withDirName(getLogsCache(context).absolutePath)
-            .withSizeLimit(logSizeLimit)
-            .withFileLimit(1)
-            .withMinPriority(logLevel)
-            .appendToFile(true)
-            .build()
-
     /**
      * Initializes and a component given the application [Context]
      *
      * @param context The application context.
      */
     override fun create(context: Context) {
-        val fileLoggerTree = createFileLoggingTree(context)
-        Timber.plant(fileLoggerTree)
         if (BuildConfig.DEBUG)
             Timber.plant(Timber.DebugTree())
     }
@@ -52,9 +26,4 @@ class TimberInitializer : Initializer<Unit> {
      */
     override fun dependencies() =
         emptyList<Class<out Initializer<*>>>()
-
-    companion object {
-        val logLevel = if (BuildConfig.DEBUG) Log.VERBOSE else Log.WARN
-        const val logSizeLimit = 750 * 1024
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/presenter/BucketPresenter.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/presenter/BucketPresenter.kt
index 35594bda..ad8d5847 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/presenter/BucketPresenter.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/presenter/BucketPresenter.kt
@@ -39,7 +39,7 @@ class BucketPresenter(
             val uploadImage = File(cache, "upload_image.webp")
             if (!uploadImage.exists()) {
                 if (!uploadImage.createNewFile()) {
-                    Timber.tag(BucketPresenter::class.java.simpleName)
+                    Timber
                         .e("Failed to create optimized image for upload")
                     return null
                 }
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/MainScreen.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/MainScreen.kt
index fcb31600..31ff5c7c 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/MainScreen.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/MainScreen.kt
@@ -22,11 +22,10 @@ import co.anitrend.retrofit.graphql.sample.view.content.market.MarketPlaceConten
 import co.anitrend.retrofit.graphql.sample.viewmodel.MainViewModel
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.navigation.NavigationView
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
-import org.koin.androidx.scope.lifecycleScope as koinScope
 
 class MainScreen : SampleActivity(), NavigationView.OnNavigationItemSelectedListener {
 
@@ -43,7 +42,7 @@ class MainScreen : SampleActivity(), NavigationView.OnNavigationItemSelectedList
 
     private val viewModel by viewModel<MainViewModel>()
 
-    private val presenter by koinScope.inject<MainPresenter>()
+    private val presenter by inject<MainPresenter>()
 
     private val headerBinding by lazy(LAZY_MODE_UNSAFE) {
         val headerView = binding.bottomNavigationView.getHeaderView(0)
@@ -168,7 +167,7 @@ class MainScreen : SampleActivity(), NavigationView.OnNavigationItemSelectedList
             runCatching {
                 onNavigate(menu)
             }.onFailure {
-                Timber.tag(moduleTag).e(it)
+                Timber.e(it)
             }
         }
     }
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/BucketContent.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/BucketContent.kt
index de21d3ca..6523388a 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/BucketContent.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/BucketContent.kt
@@ -30,7 +30,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.androidx.scope.lifecycleScope as koinScope
 
 class BucketContent(
-    override val defaultSpanSize: Int = R.integer.grid_list_x3,
+    override val defaultSpanSize: Int = co.anitrend.arch.ui.R.integer.grid_list_x3,
     override val stateConfig: StateLayoutConfig,
     override val supportViewAdapter: ISupportAdapter<BucketFile>,
     override val inflateLayout: Int = R.layout.bucket_content
@@ -38,7 +38,7 @@ class BucketContent(
 
     private lateinit var binding: BucketContentBinding
     private val viewModel by viewModel<BucketViewModel>()
-    private val presenter by koinScope.inject<BucketPresenter>()
+    private val presenter by inject<BucketPresenter>()
     private val dispatchers by inject<SupportDispatchers>()
 
     private val activityResultLauncher =
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/ui/controller/model/BucketFileItem.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/ui/controller/model/BucketFileItem.kt
index f3f4b2e4..701d7c52 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/ui/controller/model/BucketFileItem.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/ui/controller/model/BucketFileItem.kt
@@ -43,7 +43,7 @@ internal class BucketFileItem(
     ) {
         binding = BucketFileItemBinding.bind(view)
         binding?.bucketImageName?.text = entity?.fileName
-        val margin = view.resources.getDimension(R.dimen.lg_margin)
+        val margin = view.resources.getDimension(co.anitrend.arch.ui.R.dimen.lg_margin)
         binding?.bucketImage?.using(
             entity?.url,
             ColorDrawable(-0x333334),
@@ -61,7 +61,7 @@ internal class BucketFileItem(
      * @param resources optionally useful for dynamic size check with different configurations
      */
     override fun getSpanSize(spanCount: Int, position: Int, resources: Resources): Int {
-        return resources.getInteger(R.integer.grid_list_x3)
+        return resources.getInteger(co.anitrend.arch.ui.R.integer.grid_list_x3)
     }
 
     /**
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/BucketState.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/BucketState.kt
index 5cedb206..f5a66d90 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/BucketState.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/BucketState.kt
@@ -1,7 +1,7 @@
 package co.anitrend.retrofit.graphql.sample.view.content.bucket.viewmodel.state
 
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.switchMap
 import co.anitrend.arch.core.model.ISupportViewModelState
 import co.anitrend.arch.data.model.UserInterfaceState
 import co.anitrend.retrofit.graphql.data.bucket.usecase.BucketUseCaseContract
@@ -14,11 +14,11 @@ class BucketState(
     private val useCaseResult = MutableLiveData<UserInterfaceState<List<BucketFile>>>()
 
     override val model =
-        Transformations.switchMap(useCaseResult) { it.model }
+        useCaseResult.switchMap() { it.model }
     override val networkState =
-        Transformations.switchMap(useCaseResult) { it.networkState }
+        useCaseResult.switchMap() { it.networkState }
     override val refreshState =
-        Transformations.switchMap(useCaseResult) { it.refreshState }
+        useCaseResult.switchMap() { it.refreshState }
 
     operator fun invoke() {
         val result = useCase()
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/UploadState.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/UploadState.kt
index 30167d1a..1c85eb14 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/UploadState.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/bucket/viewmodel/state/UploadState.kt
@@ -1,7 +1,7 @@
 package co.anitrend.retrofit.graphql.sample.view.content.bucket.viewmodel.state
 
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.switchMap
 import co.anitrend.arch.core.model.ISupportViewModelState
 import co.anitrend.arch.data.model.UserInterfaceState
 import co.anitrend.retrofit.graphql.data.bucket.model.upload.mutation.UploadMutation
@@ -15,11 +15,11 @@ class UploadState(
     private val useCaseResult = MutableLiveData<UserInterfaceState<BucketFile>>()
 
     override val model =
-        Transformations.switchMap(useCaseResult) { it.model }
+        useCaseResult.switchMap() { it.model }
     override val networkState =
-        Transformations.switchMap(useCaseResult) { it.networkState }
+        useCaseResult.switchMap() { it.networkState }
     override val refreshState =
-        Transformations.switchMap(useCaseResult) { it.refreshState }
+        useCaseResult.switchMap() { it.refreshState }
 
     operator fun invoke(mutation: UploadMutation) {
         val result = useCase(mutation)
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/MarketPlaceContent.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/MarketPlaceContent.kt
index 5583298e..8fc240bb 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/MarketPlaceContent.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/MarketPlaceContent.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.filterIsInstance
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class MarketPlaceContent(
-    override val defaultSpanSize: Int = R.integer.single_list_size,
+    override val defaultSpanSize: Int = co.anitrend.arch.ui.R.integer.single_list_size,
     override val stateConfig: StateLayoutConfig,
     override val supportViewAdapter: ISupportAdapter<MarketPlaceListing>
 ) : SampleListFragment<MarketPlaceListing>() {
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceCategoryItem.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceCategoryItem.kt
index 51d35848..2dc3bc17 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceCategoryItem.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceCategoryItem.kt
@@ -49,7 +49,7 @@ class MarketPlaceCategoryItem(
      * @param resources optionally useful for dynamic size check with different configurations
      */
     override fun getSpanSize(spanCount: Int, position: Int, resources: Resources): Int {
-        return resources.getInteger(R.integer.single_list_size)
+        return resources.getInteger(co.anitrend.arch.ui.R.integer.single_list_size)
     }
 
     /**
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceListingItem.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceListingItem.kt
index 75e034a2..0b2d0618 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceListingItem.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/ui/controller/model/MarketPlaceListingItem.kt
@@ -76,7 +76,7 @@ class MarketPlaceListingItem(
             binding?.listingVerification?.setImageDrawable(
                 view.context.getCompatDrawable(
                     R.drawable.ic_whatshot_24dp,
-                    R.color.colorStateBlue
+                    co.anitrend.arch.ui.R.color.colorStateBlue
                 )
             )
         }
@@ -93,7 +93,7 @@ class MarketPlaceListingItem(
      * @param resources optionally useful for dynamic size check with different configurations
      */
     override fun getSpanSize(spanCount: Int, position: Int, resources: Resources): Int {
-        return resources.getInteger(R.integer.single_list_size)
+        return resources.getInteger(co.anitrend.arch.ui.R.integer.single_list_size)
     }
 
     /**
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/viewmodel/state/MarketPlaceState.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/viewmodel/state/MarketPlaceState.kt
index 87c2f68c..ced1595b 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/viewmodel/state/MarketPlaceState.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/view/content/market/viewmodel/state/MarketPlaceState.kt
@@ -1,7 +1,7 @@
 package co.anitrend.retrofit.graphql.sample.view.content.market.viewmodel.state
 
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.switchMap
 import androidx.paging.PagedList
 import co.anitrend.arch.core.model.ISupportViewModelState
 import co.anitrend.arch.data.model.UserInterfaceState
@@ -15,11 +15,11 @@ data class MarketPlaceState(
     private val useCaseResult = MutableLiveData<UserInterfaceState<PagedList<MarketPlaceListing>>>()
 
     override val model =
-        Transformations.switchMap(useCaseResult) { it.model }
+        useCaseResult.switchMap() { it.model }
     override val networkState =
-        Transformations.switchMap(useCaseResult) { it.networkState }
+        useCaseResult.switchMap() { it.networkState }
     override val refreshState =
-        Transformations.switchMap(useCaseResult) { it.refreshState }
+        useCaseResult.switchMap() { it.refreshState }
 
     operator fun invoke() {
         val result = useCase()
diff --git a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/viewmodel/model/MainState.kt b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/viewmodel/model/MainState.kt
index 7c25bebe..8d25af4b 100644
--- a/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/viewmodel/model/MainState.kt
+++ b/app/src/main/kotlin/co/anitrend/retrofit/graphql/sample/viewmodel/model/MainState.kt
@@ -1,9 +1,12 @@
 package co.anitrend.retrofit.graphql.sample.viewmodel.model
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.switchMap
 import co.anitrend.arch.core.model.ISupportViewModelState
 import co.anitrend.arch.data.model.UserInterfaceState
+import co.anitrend.arch.domain.entities.LoadState
+import co.anitrend.arch.domain.state.UiState
 import co.anitrend.retrofit.graphql.data.user.usecase.UserUseCaseContract
 import co.anitrend.retrofit.graphql.domain.entities.user.User
 
@@ -11,15 +14,14 @@ data class MainState(
     private val useCase: UserUseCaseContract
 ) : ISupportViewModelState<User> {
 
-    private val useCaseResult = MutableLiveData<UserInterfaceState<User>>()
+    private val useCaseResult = MutableLiveData<UiState<LoadState>>()
 
     override val model =
-        Transformations.switchMap(useCaseResult) { it.model }
-    override val networkState =
-        Transformations.switchMap(useCaseResult) { it.networkState }
+        useCaseResult.switchMap { it.model }
     override val refreshState =
-        Transformations.switchMap(useCaseResult) { it.refreshState }
-
+        useCaseResult.switchMap { it.refreshState }
+    override val loadState =
+        useCaseResult.switchMap { it.loadState }
 
     operator fun invoke() {
         val result = useCase()
diff --git a/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt b/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt
index a436ae0f..c0dc764a 100644
--- a/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt
+++ b/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/components/AndroidOptions.kt
@@ -107,7 +107,7 @@ private fun Project.createMavenPublicationUsing(sourcesJar: Jar) {
 }
 
 private fun Project.createDokkaTaskProvider() = tasks.named<DokkaTask>("dokkaHtml") {
-    outputDirectory.set(buildDir.resolve("docs/dokka"))
+    outputDirectory.set(layout.buildDirectory.get().dir("docs/dokka"))
 
     // Set module name displayed in the final output
     moduleName.set(this@createDokkaTaskProvider.name)
diff --git a/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/strategy/DependencyStrategy.kt b/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/strategy/DependencyStrategy.kt
index d939f9ae..1810857f 100644
--- a/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/strategy/DependencyStrategy.kt
+++ b/buildSrc/src/main/java/co/anitrend/retrofit/graphql/buildSrc/plugin/strategy/DependencyStrategy.kt
@@ -26,12 +26,6 @@ internal class DependencyStrategy(
         test(project.libs.mockk)
     }
 
-    private fun DependencyHandler.applyTestDependencies() {
-        androidTest(project.libs.mockk.android)
-        androidTest(project.libs.androidx.test.core)
-        androidTest(project.libs.androidx.test.runner)
-    }
-
 
     private fun DependencyHandler.applyNetworkingDependencies() {
         implementation(project.libs.square.retrofit)
@@ -41,6 +35,5 @@ internal class DependencyStrategy(
     fun applyDependenciesOn(handler: DependencyHandler) {
         handler.applyDefaultDependencies()
         handler.applyNetworkingDependencies()
-        handler.applyTestDependencies()
     }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 933ab4d8..01ca2300 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,8 +11,6 @@ androidx-activity = "1.9.0"
 androidx-annotation = "1.8.0"
 androidx-core = "1.13.1"
 androidx-constraintLayout = "2.1.4"
-androidx-collection = "1.4.0"
-androidx-emoji = "1.1.0"
 androidx-fragment = "1.7.1"
 androidx-lifecycle = "2.8.0"
 androidx-lifecycle-extensions = "2.2.0"
@@ -22,9 +20,8 @@ androidx-recycler = "1.3.2"
 androidx-room = "2.6.1"
 androidx-startup = "1.1.1"
 androidx-swiperefresh = "1.1.0"
-androidx-test-core = "1.5.2"
 
-anitrend-arch = "1.3.0-beta14"
+anitrend-arch = "1.7.7"
 anitrend-emojify = "1.9.1"
 
 chuncker = "3.5.2"
@@ -41,8 +38,6 @@ jetbrains-kotlinx-serialization = "1.6.3"
 koin-core = "3.5.6"
 koin-android = "3.5.6"
 
-markwon = "4.6.2"
-
 square-retrofit = "2.11.0"
 square-okhttp = "4.12.0"
 
@@ -56,44 +51,46 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
-androidx-collection = { module = "androidx.collection:collection", version.ref = "androidx-collection" }
-androidx-collection-ktx = { module = "androidx.collection:collection-ktx", version.ref = "androidx-collection" }
 androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintLayout" }
-androidx-emoji-appcompat = { module = "androidx.emoji:emoji-appcompat", version.ref = "androidx-emoji" }
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
 androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidx-lifecycle-extensions" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-livedata-core = { module = "androidx.lifecycle:lifecycle-livedata-core", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "androidx-lifecycle" }
 androidx-paging-common = { module = "androidx.paging:paging-common-ktx", version.ref = "androidx-paging" }
 androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "androidx-paging" }
 androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "androidx-paging" }
-androidx-preference = { module = "androidx.preference:preference", version.ref = "androidx-preference" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
 androidx-recycler-view = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recycler" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
-androidx-room-test = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "androidx-swiperefresh" }
-androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
-androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidx-test-core" }
-androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-core" }
-
-anitrend-arch-ui = { module = "com.github.anitrend.support-arch:support-ui", version.ref = "anitrend-arch" }
-anitrend-arch-ext = { module = "com.github.anitrend.support-arch:support-ext", version.ref = "anitrend-arch" }
-anitrend-arch-core = { module = "com.github.anitrend.support-arch:support-core", version.ref = "anitrend-arch" }
-anitrend-arch-data = { module = "com.github.anitrend.support-arch:support-data", version.ref = "anitrend-arch" }
-anitrend-arch-theme = { module = "com.github.anitrend.support-arch:support-theme", version.ref = "anitrend-arch" }
-anitrend-arch-domain = { module = "com.github.anitrend.support-arch:support-domain", version.ref = "anitrend-arch" }
-anitrend-arch-recycler = { module = "com.github.anitrend.support-arch:support-recycler", version.ref = "anitrend-arch" }
 
-anitrend-emojify = { module = "com.github.anitrend:android-emojify", version.ref = "anitrend-emojify" }
+anitrend-arch-ui = { module = "com.github.anitrend.support-arch:ui", version.ref = "anitrend-arch" }
+anitrend-arch-theme = { module = "com.github.anitrend.support-arch:theme", version.ref = "anitrend-arch" }
+anitrend-arch-recycler = { module = "com.github.anitrend.support-arch:recycler", version.ref = "anitrend-arch" }
+anitrend-arch-extension = { module = "com.github.anitrend.support-arch:extension", version.ref = "anitrend-arch" }
+anitrend-arch-domain = { module = "com.github.anitrend.support-arch:domain", version.ref = "anitrend-arch" }
+anitrend-arch-data = { module = "com.github.anitrend.support-arch:data", version.ref = "anitrend-arch" }
+anitrend-arch-core = { module = "com.github.anitrend.support-arch:core", version.ref = "anitrend-arch" }
+anitrend-arch-analytics = { module = "com.github.anitrend.support-arch:analytics", version.ref = "anitrend-arch" }
+anitrend-arch-request = { module = "com.github.anitrend.support-arch:request", version.ref = "anitrend-arch" }
+anitrend-arch-paging-legacy = { module = "com.github.anitrend.support-arch:paging-legacy", version.ref = "anitrend-arch" }
+anitrend-arch-recycler-paging-legacy = { module = "com.github.anitrend.support-arch:recycler-paging-legacy", version.ref = "anitrend-arch" }
+
+anitrend-emojify = { module = "com.github.anitrend.android-emojify:emojify", version.ref = "anitrend-emojify" }
+anitrend-emojify-contract = { module = "com.github.anitrend.android-emojify:contract", version.ref = "anitrend-emojify" }
+anitrend-emojify-kotlinx = { module = "com.github.anitrend.android-emojify:kotlinx", version.ref = "anitrend-emojify" }
 
 chuncker-debug = { module = "com.github.ChuckerTeam.Chucker:library", version.ref = "chuncker" }
 chuncker-release = { module = "com.github.ChuckerTeam.Chucker:library-no-op", version.ref = "chuncker" }
@@ -121,6 +118,7 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin-and
 square-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "square-retrofit" }
 square-retrofit-gson-converter = { module = "com.squareup.retrofit2:converter-gson", version.ref = "square-retrofit" }
 square-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "square-okhttp" }
+square-okhttp-logger = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "square-okhttp" }
 
 
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
diff --git a/jitpack.yml b/jitpack.yml
index 19e781a6..5843abda 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
-  - openjdk11
+  - openjdk17
 install:
   - echo "Running clean, build, publishMavenPublicationToMavenLocal commands"
   - ./gradlew clean build