diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56e..f4496933 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="11">
+      <module name="animity.Animity.app" target="17" />
+      <module name="Animity.buildSrc" target="17" />
+      <module name="Animity.buildSrc.main" target="17" />
+      <module name="Animity.buildSrc.test" target="17" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b46144d..f1727aa1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index abe4d809..67b94b24 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -134,7 +134,7 @@
     <option name="HEAP_SIZE" value="2048" />
     <option name="LOCALE" value="en" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index c334de8b..7936479d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
-    id "com.apollographql.apollo3" version("3.5.0")
+    id "com.apollographql.apollo3" version("3.7.0")
     id 'com.onesignal.androidsdk.onesignal-gradle-plugin'
     id "org.jlleitschuh.gradle.ktlint" version("11.0.0")
 }
@@ -217,7 +217,7 @@ dependencies {
     implementation "androidx.browser:browser:$inAppBrowserVersion"
 
     // Apollo GraphQl
-    def apolloVersion = '3.5.0'
+    def apolloVersion = '3.7.0'
     implementation "com.apollographql.apollo3:apollo-runtime:$apolloVersion"
 
     // DataStore
@@ -246,9 +246,8 @@ dependencies {
     debugImplementation "com.github.chuckerteam.chucker:library:3.5.2"
     releaseImplementation "com.github.chuckerteam.chucker:library-no-op:3.5.2"
 
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10'
 
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.9.1"
 
     def work_version = "2.7.1"
     implementation "androidx.work:work-runtime-ktx:$work_version"
@@ -256,13 +255,13 @@ dependencies {
 
     kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-    testImplementation 'app.cash.turbine:turbine:0.9.0'
+    testImplementation 'app.cash.turbine:turbine:0.12.1'
     testImplementation "junit:junit:4.13.2"
-    testImplementation "androidx.test:core:1.4.0"
-    testImplementation 'org.mockito:mockito-core:4.7.0'
+    testImplementation "androidx.test:core:1.5.0"
+    testImplementation 'org.mockito:mockito-core:4.8.1'
     testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
-    testImplementation 'io.mockk:mockk:1.12.7'
+    testImplementation 'io.mockk:mockk:1.13.2'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
-    testImplementation('com.apollographql.apollo3:apollo-testing-support:3.5.0')
+    testImplementation('com.apollographql.apollo3:apollo-testing-support:3.7.0')
 
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7b8c0a7d..4ff2a2f8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 ## Add project specific ProGuard rules here.
 ## You can control the set of applied configuration files using the
-## proguardFiles setting in build.gradle.kts.
+## proguardFiles setting in build.gradle.kts.kts.
 ##
 ## For more details, see
 ##   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/androidTest/java/com/kl3jvi/animity/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/kl3jvi/animity/ExampleInstrumentedTest.kt
index 79e83e13..d96db637 100644
--- a/app/src/androidTest/java/com/kl3jvi/animity/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/kl3jvi/animity/ExampleInstrumentedTest.kt
@@ -1,22 +1,22 @@
 package com.kl3jvi.animity
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.kl3jvi.animity", appContext.packageName)
-    }
-}
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//import androidx.test.platform.app.InstrumentationRegistry
+//import org.junit.Assert.assertEquals
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//
+///**
+// * Instrumented test, which will execute on an Android device.
+// *
+// * See [testing documentation](http://d.android.com/tools/testing).
+// */
+//@RunWith(AndroidJUnit4::class)
+//class ExampleInstrumentedTest {
+//    @Test
+//    fun useAppContext() {
+//        // Context of the app under test.
+//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+//        assertEquals("com.kl3jvi.animity", appContext.packageName)
+//    }
+//}
diff --git a/app/src/main/graphql/Query.graphql b/app/src/main/graphql/Query.graphql
index b7b2ae6c..9dc176e1 100644
--- a/app/src/main/graphql/Query.graphql
+++ b/app/src/main/graphql/Query.graphql
@@ -98,51 +98,7 @@ query AnimeListCollectionQuery(
 
                 updatedAt
                 createdAt
-                media {
-                    id
-                    title {
-                        romaji
-                        english
-                        native
-                        userPreferred
-                    }
-                    description
-                    type
-                    format
-                    status(version: 2)
-                    startDate {
-                        year
-                        month
-                        day
-                    }
-                    season
-                    seasonYear
-                    episodes
-                    duration
-                    countryOfOrigin
-                    source
-                    isFavourite
-                    coverImage {
-                        large
-                    }
-                    genres
-                    synonyms
-                    averageScore
-                    popularity
-                    tags {
-                        name
-                    }
-                    isAdult
-                    nextAiringEpisode {
-                        id
-                        airingAt
-                        episode
-                        mediaId
-                    }
-                    externalLinks {
-                        site
-                    }
-                }
+                media {...HomeMedia}
             }
             name
             isCustomList
@@ -202,22 +158,9 @@ query FavoritesAnimeQuery($id: Int, $page: Int) {
         name
         favourites {
             anime(page: $page) {
-
                 edges {
-                    node {
-                        id
-                        title {
-                            romaji
-                            userPreferred
-                        }
-                        coverImage {
-                            large
-                        }
-                        description
-                        nextAiringEpisode {
-                            airingAt
-                            episode
-                        }
+                    node{
+                        ...HomeMedia
                     }
                     favouriteOrder
                 }
@@ -241,71 +184,7 @@ query SearchAnimeQuery(
             search: $search,
             type: ANIME
         ) {
-            id
-            idMal
-            seasonYear
-            startDate { year month day }
-            title {
-                romaji
-                userPreferred
-            }
-            description
-            coverImage {
-                extraLarge
-                large
-                medium
-            }
-            nextAiringEpisode {
-                airingAt
-                episode
-            }
-            genres
-            averageScore
-            meanScore
-            nextAiringEpisode {
-                airingAt
-                episode
-            }
-            streamingEpisodes {
-                title
-                thumbnail
-            }
-            trailer { id site thumbnail }
-            bannerImage
-            recommendations {
-                nodes {
-                    id
-                    mediaRecommendation {
-                        id
-                        title {
-                            english
-                            romaji
-                            userPreferred
-                        }
-                        idMal
-                        coverImage { medium large }
-                        averageScore
-                    }
-                }
-            }
-            relations {
-                edges {
-                    id
-                    relationType(version: 2)
-                    node {
-                        format
-                        id
-                        idMal
-                        coverImage { medium large }
-                        averageScore
-                        title {
-                            english
-                            romaji
-                            userPreferred
-                        }
-                    }
-                }
-            }
+            ...HomeMedia
         }
     }
 }
@@ -423,6 +302,7 @@ fragment HomeMedia on Media {
         userPreferred
     }
     type
+    isFavourite
     status(version: 2)
     format
     description(asHtml: true)
diff --git a/app/src/main/java/com/kl3jvi/animity/data/mapper/FavoriteDataQueryConverter.kt b/app/src/main/java/com/kl3jvi/animity/data/mapper/FavoriteDataQueryConverter.kt
index 016e5c63..444748af 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/mapper/FavoriteDataQueryConverter.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/mapper/FavoriteDataQueryConverter.kt
@@ -2,9 +2,7 @@ package com.kl3jvi.animity.data.mapper
 
 import com.apollographql.apollo3.api.ApolloResponse
 import com.kl3jvi.animity.FavoritesAnimeQuery
-import com.kl3jvi.animity.data.model.ui_models.AniListMedia
-import com.kl3jvi.animity.data.model.ui_models.MediaCoverImage
-import com.kl3jvi.animity.data.model.ui_models.MediaTitle
+import com.kl3jvi.animity.data.model.ui_models.*
 
 /* It's a function that converts the data from the graphql query to the data model that we use in the
 app. */
@@ -13,12 +11,7 @@ fun ApolloResponse<FavoritesAnimeQuery.Data>.convert(): List<AniListMedia> {
     var data = listOf<AniListMedia>()
     if (!this.hasErrors() && this.data != null) {
         data = favoritesResponse?.user?.favourites?.anime?.edges?.mapNotNull {
-            AniListMedia(
-                idAniList = it?.node?.id ?: 0,
-                title = MediaTitle(userPreferred = it?.node?.title?.userPreferred.orEmpty()),
-                coverImage = MediaCoverImage(large = it?.node?.coverImage?.large.orEmpty()),
-                description = it?.node?.description.orEmpty()
-            )
+            it?.node?.homeMedia.convert()
         } ?: emptyList()
     }
     return data
diff --git a/app/src/main/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt b/app/src/main/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
index 4b978297..13edf527 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
@@ -69,6 +69,7 @@ fun HomeMedia?.convert(): AniListMedia {
         title = MediaTitle(userPreferred = this?.title?.userPreferred.orEmpty()),
         type = this?.type,
         format = this?.format,
+        isFavourite = this?.isFavourite?:false,
         streamingEpisode = this?.streamingEpisodes?.mapNotNull { it.convert() },
         nextAiringEpisode = this?.nextAiringEpisode?.airingAt,
         status = this?.status,
diff --git a/app/src/main/java/com/kl3jvi/animity/data/mapper/ProfileDataQueryConverter.kt b/app/src/main/java/com/kl3jvi/animity/data/mapper/ProfileDataQueryConverter.kt
index 252f2e6f..5887f766 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/mapper/ProfileDataQueryConverter.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/mapper/ProfileDataQueryConverter.kt
@@ -3,11 +3,8 @@ package com.kl3jvi.animity.data.mapper
 import com.apollographql.apollo3.api.ApolloResponse
 import com.kl3jvi.animity.AnimeListCollectionQuery
 import com.kl3jvi.animity.UserQuery
+import com.kl3jvi.animity.data.model.ui_models.ProfileRow
 import com.kl3jvi.animity.data.model.ui_models.AniListMedia
-import com.kl3jvi.animity.data.model.ui_models.FuzzyDate
-import com.kl3jvi.animity.data.model.ui_models.Genre
-import com.kl3jvi.animity.data.model.ui_models.MediaCoverImage
-import com.kl3jvi.animity.data.model.ui_models.MediaTitle
 import com.kl3jvi.animity.data.model.ui_models.User
 import com.kl3jvi.animity.data.model.ui_models.UserAvatar
 
@@ -42,40 +39,9 @@ fun ApolloResponse<AnimeListCollectionQuery.Data>.convert(): List<ProfileRow> {
 
 private fun List<AnimeListCollectionQuery.Entry?>?.convert(): List<AniListMedia> {
     return this?.mapNotNull {
-        AniListMedia(
-            idAniList = it?.media?.id ?: 0,
-            title = MediaTitle(userPreferred = it?.media?.title?.userPreferred.orEmpty()),
-            type = it?.media?.type,
-            format = it?.media?.format,
-            status = it?.media?.status,
-            nextAiringEpisode = it?.media?.nextAiringEpisode?.airingAt,
-            description = it?.media?.description.orEmpty(),
-            startDate = if (it?.media?.startDate?.year != null) {
-                FuzzyDate(
-                    it.media.startDate.year,
-                    it.media.startDate.month,
-                    it.media.startDate.day
-                )
-            } else {
-                null
-            },
-            coverImage = MediaCoverImage(
-                it?.media?.coverImage?.large.orEmpty(),
-                it?.media?.coverImage?.large.orEmpty(),
-                it?.media?.coverImage?.large.orEmpty()
-            ),
-            genres = it?.media?.genres?.mapNotNull { Genre(name = it.orEmpty()) } ?: listOf(),
-            averageScore = it?.media?.averageScore ?: 0
-        )
+        it?.media?.homeMedia.convert()
     } ?: listOf()
 }
 
-data class ProfileData(
-    val userData: User = User(),
-    val profileRow: List<ProfileRow> = emptyList()
-)
 
-data class ProfileRow(
-    val title: String = "",
-    val anime: List<AniListMedia> = emptyList()
-)
+
diff --git a/app/src/main/java/com/kl3jvi/animity/data/mapper/SearchDataQueryConverter.kt b/app/src/main/java/com/kl3jvi/animity/data/mapper/SearchDataQueryConverter.kt
index 2075ea70..ec3eebbf 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/mapper/SearchDataQueryConverter.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/mapper/SearchDataQueryConverter.kt
@@ -5,26 +5,6 @@ import com.kl3jvi.animity.data.model.ui_models.*
 
 fun SearchAnimeQuery.Data.convert(): List<AniListMedia> {
     return page?.media?.mapNotNull {
-        AniListMedia(
-            idAniList = it?.id ?: 0,
-            title = MediaTitle(userPreferred = it?.title?.userPreferred.orEmpty()),
-            description = it?.description.orEmpty(),
-            startDate = if (it?.startDate?.year != null) {
-                FuzzyDate(
-                    it.startDate.year,
-                    it.startDate.month,
-                    it.startDate.day
-                )
-            } else {
-                null
-            },
-            coverImage = MediaCoverImage(
-                it?.coverImage?.large.orEmpty(),
-                it?.coverImage?.large.orEmpty(),
-                it?.coverImage?.large.orEmpty()
-            ),
-            genres = it?.genres?.mapNotNull { genre -> Genre(name = genre.orEmpty()) } ?: emptyList(),
-            averageScore = it?.averageScore ?: 0
-        )
+        it?.homeMedia.convert()
     } ?: emptyList()
 }
diff --git a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/EpisodeModel.kt b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/EpisodeModel.kt
index 6206454f..9c2186b5 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/EpisodeModel.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/EpisodeModel.kt
@@ -14,7 +14,11 @@ data class EpisodeModel(
     var episodeType: String = "",
     var percentage: Int = 0,
     var isFiller: Boolean = false
-) : Parcelable
+) : Parcelable{
+    fun getEpisodeNumberOnly(): String {
+        return episodeNumber.split(" ").last()
+    }
+}
 
 data class EpisodeWithTitle(
     @SerializedName("episodes")
diff --git a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileData.kt b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileData.kt
new file mode 100644
index 00000000..cec400fa
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileData.kt
@@ -0,0 +1,6 @@
+package com.kl3jvi.animity.data.model.ui_models
+
+data class ProfileData(
+    val userData: User = User(),
+    val profileRow: List<ProfileRow> = emptyList()
+)
diff --git a/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileRow.kt b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileRow.kt
new file mode 100644
index 00000000..fd7c8518
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/data/model/ui_models/ProfileRow.kt
@@ -0,0 +1,6 @@
+package com.kl3jvi.animity.data.model.ui_models
+
+data class ProfileRow(
+    val title: String = "",
+    val anime: List<AniListMedia> = emptyList()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/kl3jvi/animity/data/repository/DetailsRepositoryImpl.kt b/app/src/main/java/com/kl3jvi/animity/data/repository/DetailsRepositoryImpl.kt
index 64406f53..dd9b252f 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/repository/DetailsRepositoryImpl.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/repository/DetailsRepositoryImpl.kt
@@ -8,12 +8,7 @@ import com.kl3jvi.animity.domain.repositories.DetailsRepository
 import com.kl3jvi.animity.parsers.GoGoParser
 import com.kl3jvi.animity.persistence.EpisodeDao
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -49,7 +44,7 @@ class DetailsRepositoryImpl @Inject constructor(
         alias: String,
         malId: Int
     ): Flow<List<EpisodeModel>> {
-        return flow {
+        val parsedEpisodeList = flow {
             val response = parser.fetchEpisodeList(
                 apiClient.fetchEpisodeList(
                     header = header,
@@ -59,29 +54,34 @@ class DetailsRepositoryImpl @Inject constructor(
                 ).string()
             ).reversed()
             emit(response)
-        }.combine(getEpisodeTitles(malId)) { episodesWithoutTitles, episodesWithTitle -> // In this combine we add title to the episodes
-            episodesWithoutTitles.forEachIndexed { index, episodeModel ->
-                if (episodeModel.episodeNumber.split(" ")
-                        .last() == episodesWithTitle.getOrNull(index)?.number
+        }
+
+        return combine(
+            parsedEpisodeList,
+            getEpisodeTitles(malId),
+            getEpisodesPercentage(malId)
+        ) { episodeModels, episodesWithTitle, episodeEntities ->
+            /* Adding episode title to the episode model. */
+            episodeModels.mapIndexed { index, episodeModel ->
+                if (episodeModel.getEpisodeNumberOnly() == episodesWithTitle.getOrNull(index)?.number
                 ) {
                     episodeModel.episodeName = episodesWithTitle[index].title
                     episodeModel.isFiller = episodesWithTitle[index].isFiller
                 } else {
                     episodeModel.episodeName = ""
+                    episodeModel.isFiller = false
                 }
-            }
-            episodesWithoutTitles
-        }
-            .combine(getEpisodesPercentage(malId)) { networkEpisodeList, episodeListFromDataBase -> // In this combine we add watched percentage to the episodes
-                networkEpisodeList.map { episode ->
-                    val contentEpisode =
-                        episodeListFromDataBase.firstOrNull { it.episodeUrl == episode.episodeUrl }
-                    if (contentEpisode != null) {
-                        episode.percentage = contentEpisode.getWatchedPercentage()
-                    }
-                    episode
+                episodeModel
+                /* Adding watched percentage to the episodes. */
+            }.map { episode ->
+                val contentEpisode =
+                    episodeEntities.firstOrNull { it.episodeUrl == episode.episodeUrl }
+                if (contentEpisode != null) {
+                    episode.percentage = contentEpisode.getWatchedPercentage()
                 }
-            }.flowOn(ioDispatcher)
+                episode
+            }
+        }.flowOn(ioDispatcher)
     }
 
     private fun getEpisodeTitles(id: Int) = flow {
diff --git a/app/src/main/java/com/kl3jvi/animity/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/kl3jvi/animity/data/repository/HomeRepositoryImpl.kt
index 97aaf041..3b1e8299 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/repository/HomeRepositoryImpl.kt
@@ -35,7 +35,7 @@ class HomeRepositoryImpl @Inject constructor(
             .setConstraints(constraints)
             .build()
 
-        workManager.enqueue(work)
+//        workManager.enqueue(work)
     }
 
     override fun getHomeData() =
diff --git a/app/src/main/java/com/kl3jvi/animity/data/repository/ProfileRepositoryImpl.kt b/app/src/main/java/com/kl3jvi/animity/data/repository/ProfileRepositoryImpl.kt
index 28ab9c2f..ddd7d8f3 100644
--- a/app/src/main/java/com/kl3jvi/animity/data/repository/ProfileRepositoryImpl.kt
+++ b/app/src/main/java/com/kl3jvi/animity/data/repository/ProfileRepositoryImpl.kt
@@ -3,8 +3,9 @@ package com.kl3jvi.animity.data.repository
 import com.apollographql.apollo3.api.ApolloResponse
 import com.kl3jvi.animity.AnimeListCollectionQuery
 import com.kl3jvi.animity.UserQuery
-import com.kl3jvi.animity.data.mapper.ProfileData
+
 import com.kl3jvi.animity.data.mapper.convert
+import com.kl3jvi.animity.data.model.ui_models.ProfileData
 import com.kl3jvi.animity.data.network.anilist_service.AniListGraphQlClient
 import com.kl3jvi.animity.domain.repositories.ProfileRepository
 import kotlinx.coroutines.CoroutineDispatcher
@@ -27,10 +28,10 @@ class ProfileRepositoryImpl @Inject constructor(
     override fun getProfileData(userId: Int?) =
         aniListGraphQlClient.getProfileData(userId)
             .mapNotNull(ApolloResponse<UserQuery.Data>::convert)
-            .combine(getProfileAnimes(userId)) { profileData, profileRow ->
+            .combine(getProfileAnimes(userId)) { userData, profileRow ->
                 ProfileData(
-                    profileData,
-                    profileRow
+                    userData = userData,
+                    profileRow = profileRow
                 )
             }.flowOn(ioDispatcher)
 
diff --git a/app/src/main/java/com/kl3jvi/animity/di/PersistenceModule.kt b/app/src/main/java/com/kl3jvi/animity/di/PersistenceModule.kt
index 703aa2a6..670a4fe1 100644
--- a/app/src/main/java/com/kl3jvi/animity/di/PersistenceModule.kt
+++ b/app/src/main/java/com/kl3jvi/animity/di/PersistenceModule.kt
@@ -6,6 +6,7 @@ import android.content.SharedPreferences
 import androidx.room.Room
 import com.kl3jvi.animity.persistence.AppDatabase
 import com.kl3jvi.animity.persistence.EpisodeDao
+import com.kl3jvi.animity.settings.Settings
 import com.kl3jvi.animity.utils.Constants.Companion.DATABASE_NAME
 import com.kl3jvi.animity.utils.Constants.Companion.SHARED_PREFERENCES_NAME
 import dagger.Module
@@ -40,4 +41,12 @@ object PersistenceModule {
     fun provideSharedPreference(@ApplicationContext context: Context): SharedPreferences {
         return context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE)
     }
+
+    @Singleton
+    @Provides
+    fun provideSettings(
+        preferences: SharedPreferences
+    ): Settings {
+        return Settings(preferences)
+    }
 }
diff --git a/app/src/main/java/com/kl3jvi/animity/domain/repositories/ProfileRepository.kt b/app/src/main/java/com/kl3jvi/animity/domain/repositories/ProfileRepository.kt
index b28b36a7..a65df655 100644
--- a/app/src/main/java/com/kl3jvi/animity/domain/repositories/ProfileRepository.kt
+++ b/app/src/main/java/com/kl3jvi/animity/domain/repositories/ProfileRepository.kt
@@ -1,6 +1,6 @@
 package com.kl3jvi.animity.domain.repositories
 
-import com.kl3jvi.animity.data.mapper.ProfileData
+import com.kl3jvi.animity.data.model.ui_models.ProfileData
 import kotlinx.coroutines.flow.Flow
 
 interface ProfileRepository {
diff --git a/app/src/main/java/com/kl3jvi/animity/settings/PreferencesHolder.kt b/app/src/main/java/com/kl3jvi/animity/settings/PreferencesHolder.kt
new file mode 100644
index 00000000..4ec3929e
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/settings/PreferencesHolder.kt
@@ -0,0 +1,7 @@
+package com.kl3jvi.animity.settings
+
+import android.content.SharedPreferences
+
+interface PreferencesHolder {
+    val preferences: SharedPreferences
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kl3jvi/animity/settings/Settings.kt b/app/src/main/java/com/kl3jvi/animity/settings/Settings.kt
new file mode 100644
index 00000000..afe836e3
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/settings/Settings.kt
@@ -0,0 +1,17 @@
+package com.kl3jvi.animity.settings
+
+import android.content.SharedPreferences
+import com.kl3jvi.animity.utils.Constants
+import javax.inject.Inject
+
+class Settings @Inject constructor(
+    override val preferences: SharedPreferences
+) : PreferencesHolder {
+
+    var skipIntroDelay by longPreference(
+        Constants.SHARED_PREFERENCES_NAME,
+        default = 0L
+    )
+
+}
+
diff --git a/app/src/main/java/com/kl3jvi/animity/settings/SharedPreferences.kt b/app/src/main/java/com/kl3jvi/animity/settings/SharedPreferences.kt
new file mode 100644
index 00000000..6da14e6c
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/settings/SharedPreferences.kt
@@ -0,0 +1,130 @@
+package com.kl3jvi.animity.settings
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+
+private class BooleanPreference(
+    private val key: String,
+    private val default: Boolean,
+) : ReadWriteProperty<PreferencesHolder, Boolean> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Boolean =
+        thisRef.preferences.getBoolean(key, default)
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Boolean) =
+        thisRef.preferences.edit().putBoolean(key, value).apply()
+}
+
+private class FloatPreference(
+    private val key: String,
+    private val default: Float,
+) : ReadWriteProperty<PreferencesHolder, Float> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Float =
+        thisRef.preferences.getFloat(key, default)
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Float) =
+        thisRef.preferences.edit().putFloat(key, value).apply()
+}
+
+private class IntPreference(
+    private val key: String,
+    private val default: Int,
+) : ReadWriteProperty<PreferencesHolder, Int> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Int =
+        thisRef.preferences.getInt(key, default)
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Int) =
+        thisRef.preferences.edit().putInt(key, value).apply()
+}
+
+private class LongPreference(
+    private val key: String,
+    private val default: Long,
+) : ReadWriteProperty<PreferencesHolder, Long> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Long =
+        thisRef.preferences.getLong(key, default)
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Long) =
+        thisRef.preferences.edit().putLong(key, value).apply()
+}
+
+private class StringPreference(
+    private val key: String,
+    private val default: String,
+    private val persistDefaultIfNotExists: Boolean = false,
+) : ReadWriteProperty<PreferencesHolder, String> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): String {
+        return thisRef.preferences.getString(key, null) ?: run {
+            when (persistDefaultIfNotExists) {
+                true -> {
+                    thisRef.preferences.edit().putString(key, default).apply()
+                    thisRef.preferences.getString(key, null)!!
+                }
+                false -> default
+            }
+        }
+    }
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: String) =
+        thisRef.preferences.edit().putString(key, value).apply()
+}
+
+private class StringSetPreference(
+    private val key: String,
+    private val default: Set<String>,
+) : ReadWriteProperty<PreferencesHolder, Set<String>> {
+
+    override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Set<String> =
+        thisRef.preferences.getStringSet(key, default) ?: default
+
+    override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Set<String>) =
+        thisRef.preferences.edit().putStringSet(key, value).apply()
+}
+
+
+fun booleanPreference(
+    key: String,
+    default: Boolean
+): ReadWriteProperty<PreferencesHolder, Boolean> =
+    BooleanPreference(key, default)
+
+
+fun floatPreference(
+    key: String,
+    default: Float
+): ReadWriteProperty<PreferencesHolder, Float> =
+    FloatPreference(key, default)
+
+
+fun intPreference(
+    key: String,
+    default: Int
+): ReadWriteProperty<PreferencesHolder, Int> =
+    IntPreference(key, default)
+
+
+fun longPreference(
+    key: String,
+    default: Long
+): ReadWriteProperty<PreferencesHolder, Long> =
+    LongPreference(key, default)
+
+
+fun stringPreference(
+    key: String,
+    default: String,
+    persistDefaultIfNotExists: Boolean = false,
+): ReadWriteProperty<PreferencesHolder, String> =
+    StringPreference(key, default, persistDefaultIfNotExists)
+
+
+fun stringSetPreference(
+    key: String,
+    default: Set<String>
+): ReadWriteProperty<PreferencesHolder, Set<String>> =
+    StringSetPreference(key, default)
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt b/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt
index cd7e8ee3..5c402f96 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/activities/main/MainActivity.kt
@@ -1,5 +1,7 @@
 package com.kl3jvi.animity.ui.activities.main
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
 import android.os.Bundle
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
@@ -71,12 +73,19 @@ class MainActivity : AppCompatActivity() {
             .animate()
             .translationY(binding.navView.height.toFloat())
             .setInterpolator(AccelerateInterpolator())
-            .setInterpolator {
-                if (it == 1F) {
+            .setListener(object : AnimatorListenerAdapter() {
+                /**
+                 *
+                 * Notifies the end of the animation. This callback is not invoked
+                 * for animations with repeat count set to INFINITE.
+                 *
+                 * @param animation The animation which reached its end.
+                 */
+                override fun onAnimationEnd(animation: Animator) {
+                    super.onAnimationEnd(animation)
                     binding.navView.isVisible = false
                 }
-                it
-            }.duration = 400
+            }).duration = 300
     }
 
     /* Showing the bottom navigation bar. */
@@ -85,12 +94,19 @@ class MainActivity : AppCompatActivity() {
             .animate()
             .translationY(0f)
             .setInterpolator(DecelerateInterpolator())
-            .setInterpolator {
-                if (it == 0F) {
+            .setListener(object : AnimatorListenerAdapter() {
+                /**
+                 *
+                 * Notifies the end of the animation. This callback is not invoked
+                 * for animations with repeat count set to INFINITE.
+                 *
+                 * @param animation The animation which reached its end.
+                 */
+                override fun onAnimationStart(animation: Animator) {
+                    super.onAnimationStart(animation)
                     binding.navView.isVisible = true
                 }
-                it
-            }.duration = 400
+            }).duration = 300
     }
 
     override fun onSupportNavigateUp(): Boolean {
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt
index 7e240556..5afe823e 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsFragment.kt
@@ -30,15 +30,10 @@ import com.kl3jvi.animity.data.model.ui_models.toStateListColor
 import com.kl3jvi.animity.databinding.FragmentDetailsBinding
 import com.kl3jvi.animity.episodeLarge
 import com.kl3jvi.animity.ui.activities.player.PlayerActivity
-import com.kl3jvi.animity.ui.fragments.favorites.FavoritesUiState
 import com.kl3jvi.animity.ui.fragments.favorites.FavoritesViewModel
-import com.kl3jvi.animity.utils.Constants
+import com.kl3jvi.animity.utils.*
 import com.kl3jvi.animity.utils.Constants.Companion.getColor
 import com.kl3jvi.animity.utils.Constants.Companion.showSnack
-import com.kl3jvi.animity.utils.collectFlow
-import com.kl3jvi.animity.utils.launchActivity
-import com.kl3jvi.animity.utils.runIfFragmentIsAttached
-import com.kl3jvi.animity.utils.setHtmlText
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -48,8 +43,7 @@ import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.launch
 import java.text.ParseException
 import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
+import java.util.*
 
 @ExperimentalCoroutinesApi
 @AndroidEntryPoint
@@ -118,7 +112,6 @@ class DetailsFragment : Fragment(R.layout.fragment_details) {
                 releaseDate.visibility = VISIBLE
                 status.visibility = VISIBLE
                 type.visibility = VISIBLE
-                detailsProgress.visibility = GONE
 
                 resultEpisodesText.visibility = VISIBLE
                 resultPlayMovie.visibility = GONE
@@ -180,20 +173,14 @@ class DetailsFragment : Fragment(R.layout.fragment_details) {
      * It observes the database for changes and updates the menu icon accordingly.
      */
     private fun updateFavoriteStatus() = runIfFragmentIsAttached {
-        collectFlow(favoritesViewModel.favoritesList) { mediaList ->
-            if (mediaList is FavoritesUiState.Success) {
-                check = mediaList.data.any { media -> media.idAniList == animeDetails.idAniList }
-                bookMarkMenuItem.setIcon(
-                    if (!check) {
-                        R.drawable.ic_favorite_uncomplete
-                    } else {
-                        R.drawable.ic_favorite_complete
-                    }
-                )
+        check = animeDetails.isFavourite
+        bookMarkMenuItem.setIcon(
+            if (!check) {
+                R.drawable.ic_favorite_uncomplete
             } else {
-                check = false
+                R.drawable.ic_favorite_complete
             }
-        }
+        )
         binding?.setType?.setOnClickListener { v ->
             showMenu(v, R.menu.popup_menu)
         }
@@ -239,7 +226,6 @@ class DetailsFragment : Fragment(R.layout.fragment_details) {
                 runIfFragmentIsAttached {
                     viewModel.episodeList.flatMapMerge(DEFAULT_CONCURRENCY) { episodeUiState ->
                         if (episodeUiState is EpisodeListUiState.Success) {
-                            binding?.detailsProgress?.visibility = GONE
                             episodeUiState.data // This is a flow of episodes we are merging with the main flow above to collect only once
                         } else {
                             emptyFlow()
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsViewModel.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsViewModel.kt
index 16a10031..c380ff9c 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsViewModel.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/details/animeDetails/DetailsViewModel.kt
@@ -54,7 +54,6 @@ class DetailsViewModel @Inject constructor(
                             malId = media.idMal.or1()
                         )
                     }.catch { e -> logError(e) }
-
                     EpisodeListUiState.Success(episodeListFlow)
                 }
             }
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/home/HomeFragment.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/home/HomeFragment.kt
index e56f3b41..71cb2a07 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/home/HomeFragment.kt
@@ -33,10 +33,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
                         binding?.root,
                         result.exception?.message ?: "Error occurred"
                     )
-
-                    HomeDataUiState.Loading -> {
-                    }
-
+                    HomeDataUiState.Loading -> {}
                     is HomeDataUiState.Success -> {
                         buildHome(
                             result.data,
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewController.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewController.kt
index 5481f931..d646071d 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewController.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewController.kt
@@ -3,8 +3,8 @@ package com.kl3jvi.animity.ui.fragments.profile
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.carousel
 import com.kl3jvi.animity.CardAnimeBindingModel_
-import com.kl3jvi.animity.data.mapper.ProfileData
 import com.kl3jvi.animity.data.model.ui_models.AniListMedia
+import com.kl3jvi.animity.data.model.ui_models.ProfileData
 import com.kl3jvi.animity.noAnime
 import com.kl3jvi.animity.profileCard
 import com.kl3jvi.animity.title
@@ -40,6 +40,7 @@ fun EpoxyController.buildProfile(
     }
 }
 
+/* A function that takes a list of AniListMedia and returns a list of CardAnimeBindingModel_ */
 fun List<AniListMedia>.modelCardAnimeProfile(): List<CardAnimeBindingModel_> {
     return map { media ->
         CardAnimeBindingModel_()
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewModel.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewModel.kt
index 82d07dbf..5887a431 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewModel.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/profile/ProfileViewModel.kt
@@ -2,7 +2,7 @@ package com.kl3jvi.animity.ui.fragments.profile
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.kl3jvi.animity.data.mapper.ProfileData
+import com.kl3jvi.animity.data.model.ui_models.ProfileData
 import com.kl3jvi.animity.domain.repositories.PersistenceRepository
 import com.kl3jvi.animity.domain.repositories.ProfileRepository
 import com.kl3jvi.animity.domain.repositories.UserRepository
@@ -23,8 +23,7 @@ class ProfileViewModel @Inject constructor(
     localStorage: PersistenceRepository
 ) : ViewModel() {
 
-    val profileData = profileRepository
-        .getProfileData(localStorage.aniListUserId?.toInt())
+    val profileData = profileRepository.getProfileData(localStorage.aniListUserId?.toInt())
         .asResult()
         .map {
             when (it) {
diff --git a/app/src/main/java/com/kl3jvi/animity/ui/fragments/settings/SettingsFragment.kt b/app/src/main/java/com/kl3jvi/animity/ui/fragments/settings/SettingsFragment.kt
index 5b5750a1..f94f0db3 100644
--- a/app/src/main/java/com/kl3jvi/animity/ui/fragments/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/kl3jvi/animity/ui/fragments/settings/SettingsFragment.kt
@@ -1,15 +1,35 @@
 package com.kl3jvi.animity.ui.fragments.settings
 
 import android.os.Bundle
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SeekBarPreference
 import com.kl3jvi.animity.R
+import com.kl3jvi.animity.settings.Settings
+import com.kl3jvi.animity.utils.requirePreference
+import javax.inject.Inject
 
 class SettingsFragment : PreferenceFragmentCompat() {
+
+    @Inject
+    lateinit var settings: Settings
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
     }
 
     override fun onResume() {
         super.onResume()
+        setupPreferences()
+    }
+
+    private fun setupPreferences() {
+        requirePreference<SeekBarPreference>(R.string.skip_intro_preference_key).apply {
+
+//            onPreferenceChangeListener =
+//                Preference.OnPreferenceChangeListener { preference, newValue ->
+//
+//                }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kl3jvi/animity/utils/ActivityUtils.kt b/app/src/main/java/com/kl3jvi/animity/utils/ActivityUtils.kt
index ef86d5b3..69ddd915 100644
--- a/app/src/main/java/com/kl3jvi/animity/utils/ActivityUtils.kt
+++ b/app/src/main/java/com/kl3jvi/animity/utils/ActivityUtils.kt
@@ -37,22 +37,3 @@ inline fun <reified T : Any> Context.launchActivity(
 inline fun <reified T : Any> newIntent(context: Context): Intent =
     Intent(context, T::class.java)
 
-fun Fragment.createFragmentMenu(
-    @MenuRes menuLayout: Int,
-    selectedItem: (menuItem: MenuItem) -> Boolean
-) {
-    val menuHost = requireActivity()
-    menuHost.addMenuProvider(
-        object : MenuProvider {
-            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                menuInflater.inflate(menuLayout, menu)
-            }
-
-            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-                return selectedItem(menuItem)
-            }
-        },
-        viewLifecycleOwner,
-        Lifecycle.State.RESUMED
-    )
-}
diff --git a/app/src/main/java/com/kl3jvi/animity/utils/Context.kt b/app/src/main/java/com/kl3jvi/animity/utils/Context.kt
new file mode 100644
index 00000000..13df47a0
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/utils/Context.kt
@@ -0,0 +1,7 @@
+package com.kl3jvi.animity.utils
+
+import android.content.Context
+import androidx.annotation.StringRes
+
+fun Context.getPreferenceKey(@StringRes resourceId: Int): String =
+    resources.getString(resourceId)
\ No newline at end of file
diff --git a/app/src/main/java/com/kl3jvi/animity/utils/Extensions.kt b/app/src/main/java/com/kl3jvi/animity/utils/Extensions.kt
new file mode 100644
index 00000000..8c29e2de
--- /dev/null
+++ b/app/src/main/java/com/kl3jvi/animity/utils/Extensions.kt
@@ -0,0 +1,17 @@
+package com.kl3jvi.animity.utils
+
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+
+
+/* It's a function that takes a resource ID and returns a string. */
+fun Fragment.getPreferenceKey(@StringRes resourceId: Int): String = getString(resourceId)
+
+/**
+ * Find a preference with the corresponding key and throw if it does not exist.
+ * @param preferenceId Resource ID from preference_keys
+ */
+fun <T : Preference> PreferenceFragmentCompat.requirePreference(@StringRes preferenceId: Int) =
+    requireNotNull(findPreference<T>(getPreferenceKey(preferenceId)))
\ No newline at end of file
diff --git a/app/src/main/java/com/kl3jvi/animity/utils/FragmentUtils.kt b/app/src/main/java/com/kl3jvi/animity/utils/FragmentUtils.kt
index e330a535..809d90be 100644
--- a/app/src/main/java/com/kl3jvi/animity/utils/FragmentUtils.kt
+++ b/app/src/main/java/com/kl3jvi/animity/utils/FragmentUtils.kt
@@ -1,8 +1,14 @@
 package com.kl3jvi.animity.utils
 
 import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
+import androidx.annotation.MenuRes
+import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.navigation.NavDirections
 import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
@@ -29,6 +35,27 @@ fun View.canNavigate(): Boolean {
     }
 }
 
+
+fun Fragment.createFragmentMenu(
+    @MenuRes menuLayout: Int,
+    selectedItem: (menuItem: MenuItem) -> Boolean
+) {
+    val menuHost = requireActivity()
+    menuHost.addMenuProvider(
+        object : MenuProvider {
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+                menuInflater.inflate(menuLayout, menu)
+            }
+
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+                return selectedItem(menuItem)
+            }
+        },
+        viewLifecycleOwner,
+        Lifecycle.State.RESUMED
+    )
+}
+
 internal inline fun Fragment.runIfFragmentIsAttached(block: () -> Unit) {
     context?.let { block() }
 }
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index 5dd1130d..8f6779e2 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -332,12 +332,6 @@
         tools:listitem="@layout/item_episode_list"
         tools:visibility="visible" />
 
-    <ProgressBar
-        android:id="@+id/details_progress"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
+
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_profile_card.xml b/app/src/main/res/layout/item_profile_card.xml
index 81a85f91..dbeb6d55 100644
--- a/app/src/main/res/layout/item_profile_card.xml
+++ b/app/src/main/res/layout/item_profile_card.xml
@@ -53,7 +53,7 @@
                     android:layout_height="110dp"
                     android:padding="10dp"
                     app:avatarImage="@{userData.avatar.large}"
-                    app:avatarViewBorderColor="@color/green_theme"
+                    app:avatarViewBorderColor="@color/wrapper"
                     app:avatarViewBorderWidth="3dp"
                     app:avatarViewShape="circle"
                     app:layout_constraintEnd_toStartOf="@+id/username"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 821dbc8e..77507fad 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -45,6 +45,7 @@
     <color name="grey">#A7A7A9</color>
 
     <color name="green_theme">#048a81</color>
+    <color name="wrapper">#80048A81</color>
     <color name="videoProgress">#66B5B5B5</color>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4722bc55..c58b17ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,10 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
+
+    <string name="skip_intro_preference_key">pref_skip_intro</string>
+
+
     <string name="retry">Retry</string>
     <string name="next_episode">Next Episode</string>
     <string name="quality_auto">Auto</string>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index bca2ed46..9b12c48c 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">gogoanime.gg</domain>
+        <domain includeSubdomains="true">gogoanime.ar</domain>
         <domain includeSubdomains="true">gogoanime.lu</domain>
         <domain includeSubdomains="true">gogoanime.tel</domain>
         <domain includeSubdomains="true">ajax.gogocdn.net</domain>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 75b811c2..f8a1d2d5 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -3,11 +3,11 @@
 
     <PreferenceCategory app:title="@string/player_settings">
 
-        <EditTextPreference
-            app:key="signature"
-            app:title="@string/signature_title"
-            app:useSimpleSummaryProvider="true" />
-
+        <SeekBarPreference
+            android:max="240"
+            app:key="skip_delay"
+            app:seekBarIncrement="5"
+            app:title="@string/signature_title" />
 
         <SeekBarPreference
             android:max="60"
@@ -16,14 +16,17 @@
             app:showSeekBarValue="true"
             app:title="Seek Forward Time" />
 
+
         <SeekBarPreference
             android:max="60"
             app:key="forward"
             app:showSeekBarValue="true"
             app:title="Seek Backward Time" />
 
-    </PreferenceCategory>
-    <PreferenceCategory app:title="@string/network_settings">
+        <SwitchPreference
+            app:key="pip"
+            android:summary="Continues playback in a miniature player on top of other apps"
+            app:title="Picture-inPicture" />
 
     </PreferenceCategory>
 
diff --git a/app/src/test/java/com/kl3jvi/animity/data/mapper/FavoriteMapperQueryTest.kt b/app/src/test/java/com/kl3jvi/animity/data/mapper/FavoriteMapperQueryTest.kt
index c0b30e85..bc197043 100644
--- a/app/src/test/java/com/kl3jvi/animity/data/mapper/FavoriteMapperQueryTest.kt
+++ b/app/src/test/java/com/kl3jvi/animity/data/mapper/FavoriteMapperQueryTest.kt
@@ -1,15 +1,15 @@
 package com.kl3jvi.animity.data.mapper
 
 import com.kl3jvi.animity.FavoritesAnimeQuery
-import com.kl3jvi.animity.util.userFavoritesModel
+//import com.kl3jvi.animity.util.userFavoritesModel
 import org.junit.Test
 
-class FavoriteMapperQueryTest {
-    @Test
-    fun favoritesAnimeQuery_can_convert_to_List_of_AniList_Media() {
-        val data = FavoritesAnimeQuery.Data(
-            user = userFavoritesModel
-        )
+//class FavoriteMapperQueryTest {
+//    @Test
+//    fun favoritesAnimeQuery_can_convert_to_List_of_AniList_Media() {
+//        val data = FavoritesAnimeQuery.Data(
+//            user = userFavoritesModel
+//        )
 
 //
 //
@@ -17,5 +17,5 @@ class FavoriteMapperQueryTest {
 //        assertEquals("One Piece", convertedData.first().title.userPreferred)
 //        assertEquals("https://example.com", convertedData.first().coverImage.large)
 //        assertEquals("Lorem Ipsum dolor sit amet ...", convertedData.first().description)
-    }
-}
+//    }
+//}
diff --git a/app/src/test/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt b/app/src/test/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
index 05269069..c5ff586b 100644
--- a/app/src/test/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
+++ b/app/src/test/java/com/kl3jvi/animity/data/mapper/HomeDataQueryConverter.kt
@@ -1,23 +1,23 @@
 package com.kl3jvi.animity.data.mapper
 
 import com.kl3jvi.animity.HomeDataQuery
-import com.kl3jvi.animity.util.moviesModel
-import com.kl3jvi.animity.util.popularAnimeModel
-import com.kl3jvi.animity.util.reviewModel
-import com.kl3jvi.animity.util.trendingAnimeModel
+//import com.kl3jvi.animity.util.moviesModel
+//import com.kl3jvi.animity.util.popularAnimeModel
+//import com.kl3jvi.animity.util.reviewModel
+//import com.kl3jvi.animity.util.trendingAnimeModel
 import org.junit.Test
 
 class HomeDataQueryConverter {
     @Test
     fun homeData_query_can_be_converted_to_Home_Media() {
-        val data = HomeDataQuery.Data(
-            trendingAnime = trendingAnimeModel,
-            movies = moviesModel,
-            popularAnime = popularAnimeModel,
-            review = reviewModel
-        )
+//        val data = HomeDataQuery.Data(
+//            trendingAnime = trendingAnimeModel,
+//            movies = moviesModel,
+//            popularAnime = popularAnimeModel,
+//            review = reviewModel
+//        )
 
-        val convertedData = data
+//        val convertedData = data
 
         // Test for trending media
 //        assertEquals("One Piece", convertedData.trendingAnime.first().title.userPreferred)
diff --git a/app/src/test/java/com/kl3jvi/animity/data/repository/fragment_repositories/HomeRepositoryImplTest.kt b/app/src/test/java/com/kl3jvi/animity/data/repository/fragment_repositories/HomeRepositoryImplTest.kt
index 0dfc841f..a2dc7fb9 100644
--- a/app/src/test/java/com/kl3jvi/animity/data/repository/fragment_repositories/HomeRepositoryImplTest.kt
+++ b/app/src/test/java/com/kl3jvi/animity/data/repository/fragment_repositories/HomeRepositoryImplTest.kt
@@ -40,24 +40,24 @@ class HomeRepositoryImplTest {
             .networkTransport(QueueTestNetworkTransport())
             .build()
         client = GogoAnimeApiClient(service)
-        repository = HomeRepositoryImpl(client, coroutinesRule.testDispatcher, parser)
+//        repository = HomeRepositoryImpl(client, coroutinesRule.testDispatcher, parser)
     }
 
     @Test
     fun getHomeDataSuccessful() = runTest {
-        val mockData = HomeDataQuery.Data(
-            trendingAnime = trendingAnimeModel,
-            movies = moviesModel,
-            popularAnime = popularAnimeModel,
-            review = reviewModel
-        )
-        val testQuery = HomeDataQuery()
-        apolloClient.enqueueTestResponse(testQuery, mockData)
-        val actual = apolloClient.query(testQuery).execute().data!!
-        assertEquals(
-            mockData.movies?.media?.first()?.homeMedia?.id,
-            actual.movies?.media?.first()?.homeMedia?.id
-        )
+//        val mockData = HomeDataQuery.Data(
+//            trendingAnime = trendingAnimeModel,
+//            movies = moviesModel,
+//            popularAnime = popularAnimeModel,
+//            review = reviewModel
+//        )
+//        val testQuery = HomeDataQuery()
+//        apolloClient.enqueueTestResponse(testQuery, mockData)
+//        val actual = apolloClient.query(testQuery).execute().data!!
+//        assertEquals(
+//            mockData.movies?.media?.first()?.homeMedia?.id,
+//            actual.movies?.media?.first()?.homeMedia?.id
+//        )
     }
 
     @Test
diff --git a/app/src/test/java/com/kl3jvi/animity/util/HelperModels.kt b/app/src/test/java/com/kl3jvi/animity/util/HelperModels.kt
index dacb73d1..b30d024e 100644
--- a/app/src/test/java/com/kl3jvi/animity/util/HelperModels.kt
+++ b/app/src/test/java/com/kl3jvi/animity/util/HelperModels.kt
@@ -1,181 +1,181 @@
-package com.kl3jvi.animity.util
-
-import com.kl3jvi.animity.FavoritesAnimeQuery
-import com.kl3jvi.animity.HomeDataQuery
-import com.kl3jvi.animity.fragment.HomeMedia
-import com.kl3jvi.animity.type.MediaFormat
-import com.kl3jvi.animity.type.MediaStatus
-import com.kl3jvi.animity.type.MediaType
-
-val trendingAnimeModel = HomeDataQuery.TrendingAnime(
-    media = listOf(
-        HomeDataQuery.Medium(
-            __typename = "Trending Media",
-            homeMedia = HomeMedia(
-                id = 1,
-                idMal = 2,
-                title = HomeMedia.Title(
-                    romaji = "One Piece",
-                    userPreferred = "One Piece"
-                ),
-                type = MediaType.ANIME,
-                status = MediaStatus.HIATUS,
-                format = MediaFormat.MANGA,
-                description = "Lorem Ipsum dolor sit amet ...",
-                coverImage = HomeMedia.CoverImage(
-                    large = "https://github.com",
-                    medium = "https://example.com",
-                    extraLarge = "https://example.com"
-                ),
-                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
-                nextAiringEpisode = HomeMedia.NextAiringEpisode(
-                    airingAt = 1,
-                    episode = 2
-                ),
-                "https://github.com",
-                genres = listOf<String>("Action", "Fantasy"),
-                averageScore = 1,
-                favourites = 30,
-                startDate = HomeMedia.StartDate(2000, 1, 3)
-            )
-        )
-    )
-)
-
-val moviesModel = HomeDataQuery.Movies(
-    media = listOf(
-        HomeDataQuery.Medium2(
-            __typename = "Movies",
-            homeMedia = HomeMedia(
-                id = 1,
-                idMal = 2,
-                title = HomeMedia.Title(
-                    romaji = "Naruto",
-                    userPreferred = "Naruto"
-                ),
-                type = MediaType.ANIME,
-                status = MediaStatus.HIATUS,
-                format = MediaFormat.MANGA,
-                description = "Lorem Ipsum dolor sit amet ...",
-                coverImage = HomeMedia.CoverImage(
-                    large = "https://naruto.com",
-                    medium = "https://naruto.com",
-                    extraLarge = "https://naruto.com"
-                ),
-                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
-                nextAiringEpisode = HomeMedia.NextAiringEpisode(
-                    airingAt = 1,
-                    episode = 2
-                ),
-                "https://naruto.com",
-                genres = listOf<String>("Fantasy", "Animation"),
-                averageScore = 1,
-                favourites = 30,
-                startDate = HomeMedia.StartDate(1999, 3, 5)
-            )
-        )
-    )
-)
-
-val popularAnimeModel = HomeDataQuery.PopularAnime(
-    media = listOf(
-        HomeDataQuery.Medium1(
-            __typename = "Popular Anime",
-            homeMedia = HomeMedia(
-                id = 1,
-                idMal = 2,
-                title = HomeMedia.Title(
-                    romaji = "AOT",
-                    userPreferred = "AOT"
-                ),
-                type = MediaType.ANIME,
-                status = MediaStatus.HIATUS,
-                format = MediaFormat.MANGA,
-                description = "Lorem Ipsum dolor sit amet ...",
-                coverImage = HomeMedia.CoverImage(
-                    large = "https://AOT.com",
-                    medium = "https://AOT.com",
-                    extraLarge = "https://AOT.com"
-                ),
-                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
-                nextAiringEpisode = HomeMedia.NextAiringEpisode(
-                    airingAt = 1,
-                    episode = 2
-                ),
-                "https://AOT.com",
-                genres = listOf<String>("ATTACK", "FIGHT"),
-                averageScore = 1,
-                favourites = 30,
-                startDate = HomeMedia.StartDate(1873, 12, 1)
-            )
-        )
-    )
-)
-
-val reviewModel = HomeDataQuery.Review(
-    listOf(
-        HomeDataQuery.Review1(
-            id = 1,
-            userId = 2,
-            mediaId = 3,
-            mediaType = MediaType.ANIME,
-            summary = "Lorem Ipsum",
-            body = "This is a random string",
-            rating = 3,
-            ratingAmount = 19,
-            score = 199,
-            user = HomeDataQuery.User(
-                id = 1,
-                name = "Klejvi",
-                avatar = HomeDataQuery.Avatar(
-                    large = "https://avatar1.com/large",
-                    medium = "https://avatar1.com/medium"
-                )
-            ),
-            media = HomeDataQuery.Media(
-                1,
-                title = HomeDataQuery.Title(
-                    romaji = "Review For XXX",
-                    userPreferred = "Review For XXX"
-                ),
-                bannerImage = "https://bannerImage.com",
-                coverImage = HomeDataQuery.CoverImage(large = "https://coverImage.com")
-
-            )
-        )
-    )
-)
-
-val userFavoritesModel = FavoritesAnimeQuery.User(
-    id = 1,
-    name = "Klejvi",
-    favourites = FavoritesAnimeQuery.Favourites(
-        anime = FavoritesAnimeQuery.Anime(
-            listOf(
-                FavoritesAnimeQuery.Edge(
-                    node = FavoritesAnimeQuery.Node(
-                        id = 1,
-                        title = FavoritesAnimeQuery.Title(
-                            userPreferred = "One Piece",
-                            romaji = ""
-                        ),
-                        coverImage = FavoritesAnimeQuery.CoverImage(large = "https://example.com"),
-                        description = "Lorem Ipsum dolor sit amet ...",
-                        nextAiringEpisode = FavoritesAnimeQuery.NextAiringEpisode(
-                            airingAt = 1,
-                            episode = 100
-                        )
-                    ),
-                    favouriteOrder = 1
-                )
-            ),
-            FavoritesAnimeQuery.PageInfo(
-                total = 1,
-                perPage = 25,
-                currentPage = 2,
-                lastPage = 5,
-                hasNextPage = true
-            )
-        )
-    )
-)
+//package com.kl3jvi.animity.util
+//
+//import com.kl3jvi.animity.FavoritesAnimeQuery
+//import com.kl3jvi.animity.HomeDataQuery
+//import com.kl3jvi.animity.fragment.HomeMedia
+//import com.kl3jvi.animity.type.MediaFormat
+//import com.kl3jvi.animity.type.MediaStatus
+//import com.kl3jvi.animity.type.MediaType
+//
+//val trendingAnimeModel = HomeDataQuery.TrendingAnime(
+//    media = listOf(
+//        HomeDataQuery.Medium(
+//            __typename = "Trending Media",
+//            homeMedia = HomeMedia(
+//                id = 1,
+//                idMal = 2,
+//                title = HomeMedia.Title(
+//                    romaji = "One Piece",
+//                    userPreferred = "One Piece"
+//                ),
+//                type = MediaType.ANIME,
+//                status = MediaStatus.HIATUS,
+//                format = MediaFormat.MANGA,
+//                description = "Lorem Ipsum dolor sit amet ...",
+//                coverImage = HomeMedia.CoverImage(
+//                    large = "https://github.com",
+//                    medium = "https://example.com",
+//                    extraLarge = "https://example.com"
+//                ),
+//                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
+//                nextAiringEpisode = HomeMedia.NextAiringEpisode(
+//                    airingAt = 1,
+//                    episode = 2
+//                ),
+//                "https://github.com",
+//                genres = listOf<String>("Action", "Fantasy"),
+//                averageScore = 1,
+//                favourites = 30,
+//                startDate = HomeMedia.StartDate(2000, 1, 3)
+//            )
+//        )
+//    )
+//)
+//
+//val moviesModel = HomeDataQuery.Movies(
+//    media = listOf(
+//        HomeDataQuery.Medium2(
+//            __typename = "Movies",
+//            homeMedia = HomeMedia(
+//                id = 1,
+//                idMal = 2,
+//                title = HomeMedia.Title(
+//                    romaji = "Naruto",
+//                    userPreferred = "Naruto"
+//                ),
+//                type = MediaType.ANIME,
+//                status = MediaStatus.HIATUS,
+//                format = MediaFormat.MANGA,
+//                description = "Lorem Ipsum dolor sit amet ...",
+//                coverImage = HomeMedia.CoverImage(
+//                    large = "https://naruto.com",
+//                    medium = "https://naruto.com",
+//                    extraLarge = "https://naruto.com"
+//                ),
+//                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
+//                nextAiringEpisode = HomeMedia.NextAiringEpisode(
+//                    airingAt = 1,
+//                    episode = 2
+//                ),
+//                "https://naruto.com",
+//                genres = listOf<String>("Fantasy", "Animation"),
+//                averageScore = 1,
+//                favourites = 30,
+//                startDate = HomeMedia.StartDate(1999, 3, 5)
+//            )
+//        )
+//    )
+//)
+//
+//val popularAnimeModel = HomeDataQuery.PopularAnime(
+//    media = listOf(
+//        HomeDataQuery.Medium1(
+//            __typename = "Popular Anime",
+//            homeMedia = HomeMedia(
+//                id = 1,
+//                idMal = 2,
+//                title = HomeMedia.Title(
+//                    romaji = "AOT",
+//                    userPreferred = "AOT"
+//                ),
+//                type = MediaType.ANIME,
+//                status = MediaStatus.HIATUS,
+//                format = MediaFormat.MANGA,
+//                description = "Lorem Ipsum dolor sit amet ...",
+//                coverImage = HomeMedia.CoverImage(
+//                    large = "https://AOT.com",
+//                    medium = "https://AOT.com",
+//                    extraLarge = "https://AOT.com"
+//                ),
+//                streamingEpisodes = listOf<HomeMedia.StreamingEpisode>(),
+//                nextAiringEpisode = HomeMedia.NextAiringEpisode(
+//                    airingAt = 1,
+//                    episode = 2
+//                ),
+//                "https://AOT.com",
+//                genres = listOf<String>("ATTACK", "FIGHT"),
+//                averageScore = 1,
+//                favourites = 30,
+//                startDate = HomeMedia.StartDate(1873, 12, 1)
+//            )
+//        )
+//    )
+//)
+//
+//val reviewModel = HomeDataQuery.Review(
+//    listOf(
+//        HomeDataQuery.Review1(
+//            id = 1,
+//            userId = 2,
+//            mediaId = 3,
+//            mediaType = MediaType.ANIME,
+//            summary = "Lorem Ipsum",
+//            body = "This is a random string",
+//            rating = 3,
+//            ratingAmount = 19,
+//            score = 199,
+//            user = HomeDataQuery.User(
+//                id = 1,
+//                name = "Klejvi",
+//                avatar = HomeDataQuery.Avatar(
+//                    large = "https://avatar1.com/large",
+//                    medium = "https://avatar1.com/medium"
+//                )
+//            ),
+//            media = HomeDataQuery.Media(
+//                1,
+//                title = HomeDataQuery.Title(
+//                    romaji = "Review For XXX",
+//                    userPreferred = "Review For XXX"
+//                ),
+//                bannerImage = "https://bannerImage.com",
+//                coverImage = HomeDataQuery.CoverImage(large = "https://coverImage.com")
+//
+//            )
+//        )
+//    )
+//)
+//
+//val userFavoritesModel = FavoritesAnimeQuery.User(
+//    id = 1,
+//    name = "Klejvi",
+//    favourites = FavoritesAnimeQuery.Favourites(
+//        anime = FavoritesAnimeQuery.Anime(
+//            listOf(
+//                FavoritesAnimeQuery.Edge(
+//                    node = FavoritesAnimeQuery.Node(
+//                        id = 1,
+//                        title = FavoritesAnimeQuery.Title(
+//                            userPreferred = "One Piece",
+//                            romaji = ""
+//                        ),
+//                        coverImage = FavoritesAnimeQuery.CoverImage(large = "https://example.com"),
+//                        description = "Lorem Ipsum dolor sit amet ...",
+//                        nextAiringEpisode = FavoritesAnimeQuery.NextAiringEpisode(
+//                            airingAt = 1,
+//                            episode = 100
+//                        )
+//                    ),
+//                    favouriteOrder = 1
+//                )
+//            ),
+//            FavoritesAnimeQuery.PageInfo(
+//                total = 1,
+//                perPage = 25,
+//                currentPage = 2,
+//                lastPage = 5,
+//                hasNextPage = true
+//            )
+//        )
+//    )
+//)
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index bde3ed38..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.43.2"
-        classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
-        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
-
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.13.4'
-        def nav_version = '2.4.1'
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..7a8ca695
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,18 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath(libs.com.android.tools.build.gradle)
+        classpath(libs.com.google.dagger.hilt.android.gradle.plugin)
+        classpath(libs.com.google.gms.google.services)
+        classpath(libs.com.google.firebase.firebase.crashlytics.gradle)
+        classpath(libs.com.google.android.libraries.mapsplatform.secrets.gradle.plugin)
+        classpath(libs.gradle.plugin.com.onesignal.onesignal.gradle.plugin)
+        classpath(libs.androidx.navigation.navigation.safe.args.gradle.plugin)
+        classpath(libs.org.jetbrains.kotlin.kotlin.gradle.plugin)
+    }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..b22ed732
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Configuration.kt b/buildSrc/src/main/kotlin/Configuration.kt
new file mode 100644
index 00000000..85b8257d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Configuration.kt
@@ -0,0 +1,10 @@
+object Configuration {
+  const val compileSdk = 33
+  const val targetSdk = 33
+  const val minSdk = 21
+  const val majorVersion = 1
+  const val minorVersion = 1
+  const val patchVersion = 1
+  const val versionName = "$majorVersion.$minorVersion.$patchVersion"
+  const val versionCode = 12
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index ca36a32b..2d7d09e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-org.gradle.unsafe.configuration-cache=true
\ No newline at end of file
+#org.gradle.unsafe.configuration-cache=true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..d9ae87b6
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,357 @@
+[versions]
+androidx-activity = "1.5.1"
+androidx-annotation = "1.3.0"
+androidx-appcompat = "1.5.1"
+androidx-arch-core = "2.1.0"
+androidx-databinding = "7.3.0"
+androidx-emoji2 = "1.2.0"
+androidx-fragment = "1.5.4"
+androidx-hilt = "1.0.0"
+androidx-legacy = "1.0.0"
+androidx-paging = "3.1.1"
+androidx-palette = "1.0.0"
+androidx-preference = "1.2.0"
+androidx-room = "2.4.3"
+androidx-savedstate = "1.2.0"
+androidx-sqlite = "2.2.0"
+androidx-vectordrawable = "1.1.0"
+androidx-work = "2.7.1"
+com-apollographql-apollo3 = "3.5.0"
+com-benasher44 = "0.3.1"
+com-github-bumptech-glide = "4.13.2"
+com-github-chuckerteam-chucker = "3.5.2"
+com-google-android-exoplayer = "2.18.1"
+com-squareup-leakcanary = "2.9.1"
+com-squareup-okio = "3.1.0"
+com-squareup-retrofit2 = "2.9.0"
+io-coil-kt = "2.1.0"
+io-getstream = "1.0.6"
+org-jetbrains-kotlin = "1.7.10"
+org-jetbrains-kotlinx = "1.6.4"
+
+[libraries]
+androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
+androidx-activity-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
+androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
+androidx-annotation-annotation-experimental = { module = "androidx.annotation:annotation-experimental", version.ref = "androidx-annotation" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+androidx-appcompat-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" }
+androidx-arch-core-core-common = { module = "androidx.arch.core:core-common", version.ref = "androidx-arch-core" }
+androidx-arch-core-core-runtime = { module = "androidx.arch.core:core-runtime", version.ref = "androidx-arch-core" }
+androidx-asynclayoutinflater = "androidx.asynclayoutinflater:asynclayoutinflater:1.0.0"
+androidx-browser = "androidx.browser:browser:1.4.0"
+androidx-cardview = "androidx.cardview:cardview:1.0.0"
+androidx-collection = "androidx.collection:collection:1.2.0"
+androidx-collection-collection-ktx = "androidx.collection:collection-ktx:1.1.0"
+androidx-concurrent-concurrent-futures = "androidx.concurrent:concurrent-futures:1.0.0"
+androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
+androidx-constraintlayout-constraintlayout-core = "androidx.constraintlayout:constraintlayout-core:1.0.4"
+androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+androidx-core = "androidx.core:core:1.9.0"
+androidx-core-core-ktx = "androidx.core:core-ktx:1.9.0"
+androidx-core-core-splashscreen = "androidx.core:core-splashscreen:1.0.0"
+androidx-cursoradapter = "androidx.cursoradapter:cursoradapter:1.0.0"
+androidx-customview = "androidx.customview:customview:1.1.0"
+androidx-databinding-databinding-adapters = { module = "androidx.databinding:databinding-adapters", version.ref = "androidx-databinding" }
+androidx-databinding-databinding-common = { module = "androidx.databinding:databinding-common", version.ref = "androidx-databinding" }
+androidx-databinding-databinding-compiler = { module = "androidx.databinding:databinding-compiler", version.ref = "androidx-databinding" }
+androidx-databinding-databinding-ktx = { module = "androidx.databinding:databinding-ktx", version.ref = "androidx-databinding" }
+androidx-databinding-databinding-runtime = { module = "androidx.databinding:databinding-runtime", version.ref = "androidx-databinding" }
+androidx-databinding-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "androidx-databinding" }
+androidx-documentfile = "androidx.documentfile:documentfile:1.0.0"
+androidx-drawerlayout = "androidx.drawerlayout:drawerlayout:1.1.1"
+androidx-dynamicanimation = "androidx.dynamicanimation:dynamicanimation:1.0.0"
+androidx-emoji2 = { module = "androidx.emoji2:emoji2", version.ref = "androidx-emoji2" }
+androidx-emoji2-emoji2-views-helper = { module = "androidx.emoji2:emoji2-views-helper", version.ref = "androidx-emoji2" }
+androidx-exifinterface = "androidx.exifinterface:exifinterface:1.3.3"
+androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
+androidx-fragment-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
+androidx-hilt-hilt-common = { module = "androidx.hilt:hilt-common", version.ref = "androidx-hilt" }
+androidx-hilt-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" }
+androidx-hilt-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" }
+androidx-interpolator = "androidx.interpolator:interpolator:1.0.0"
+androidx-legacy-legacy-support-core-ui = { module = "androidx.legacy:legacy-support-core-ui", version.ref = "androidx-legacy" }
+androidx-legacy-legacy-support-core-utils = { module = "androidx.legacy:legacy-support-core-utils", version.ref = "androidx-legacy" }
+androidx-legacy-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "androidx-legacy" }
+androidx-lifecycle-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.5.1"
+androidx-lifecycle-lifecycle-livedata = "androidx.lifecycle:lifecycle-livedata:2.5.1"
+androidx-lifecycle-lifecycle-livedata-core = "androidx.lifecycle:lifecycle-livedata-core:2.5.1"
+androidx-lifecycle-lifecycle-livedata-core-ktx = "androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1"
+androidx-lifecycle-lifecycle-livedata-ktx = "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+androidx-lifecycle-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.4.1"
+androidx-lifecycle-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime:2.5.1"
+androidx-lifecycle-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+androidx-lifecycle-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.4.0"
+androidx-lifecycle-lifecycle-viewmodel = "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
+androidx-lifecycle-lifecycle-viewmodel-ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+androidx-lifecycle-lifecycle-viewmodel-savedstate = "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1"
+androidx-loader = "androidx.loader:loader:1.0.0"
+androidx-localbroadcastmanager = "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
+androidx-media = "androidx.media:media:1.4.3"
+androidx-mediarouter = "androidx.mediarouter:mediarouter:1.2.2"
+androidx-navigation-navigation-common = "androidx.navigation:navigation-common:2.5.3"
+androidx-navigation-navigation-common-ktx = "androidx.navigation:navigation-common-ktx:2.5.3"
+androidx-navigation-navigation-fragment = "androidx.navigation:navigation-fragment:2.5.3"
+androidx-navigation-navigation-fragment-ktx = "androidx.navigation:navigation-fragment-ktx:2.5.3"
+androidx-navigation-navigation-runtime = "androidx.navigation:navigation-runtime:2.5.3"
+androidx-navigation-navigation-runtime-ktx = "androidx.navigation:navigation-runtime-ktx:2.5.3"
+androidx-navigation-navigation-safe-args-gradle-plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1"
+androidx-navigation-navigation-ui = "androidx.navigation:navigation-ui:2.5.3"
+androidx-navigation-navigation-ui-ktx = "androidx.navigation:navigation-ui-ktx:2.5.3"
+androidx-paging-paging-common = { module = "androidx.paging:paging-common", version.ref = "androidx-paging" }
+androidx-paging-paging-common-ktx = { module = "androidx.paging:paging-common-ktx", version.ref = "androidx-paging" }
+androidx-paging-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "androidx-paging" }
+androidx-paging-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "androidx-paging" }
+androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette" }
+androidx-palette-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "androidx-palette" }
+androidx-preference = { module = "androidx.preference:preference", version.ref = "androidx-preference" }
+androidx-preference-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preference" }
+androidx-print = "androidx.print:print:1.0.0"
+androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.1"
+androidx-resourceinspection-resourceinspection-annotation = "androidx.resourceinspection:resourceinspection-annotation:1.0.1"
+androidx-room-room-common = { module = "androidx.room:room-common", version.ref = "androidx-room" }
+androidx-room-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
+androidx-room-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
+androidx-room-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
+androidx-savedstate = { module = "androidx.savedstate:savedstate", version.ref = "androidx-savedstate" }
+androidx-savedstate-savedstate-ktx = { module = "androidx.savedstate:savedstate-ktx", version.ref = "androidx-savedstate" }
+androidx-slidingpanelayout = "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
+androidx-sqlite = { module = "androidx.sqlite:sqlite", version.ref = "androidx-sqlite" }
+androidx-sqlite-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "androidx-sqlite" }
+androidx-startup-startup-runtime = "androidx.startup:startup-runtime:1.1.1"
+androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+androidx-test-core = "androidx.test:core:1.5.0"
+androidx-tracing = "androidx.tracing:tracing:1.0.0"
+androidx-transition = "androidx.transition:transition:1.4.1"
+androidx-vectordrawable = { module = "androidx.vectordrawable:vectordrawable", version.ref = "androidx-vectordrawable" }
+androidx-vectordrawable-vectordrawable-animated = { module = "androidx.vectordrawable:vectordrawable-animated", version.ref = "androidx-vectordrawable" }
+androidx-versionedparcelable = "androidx.versionedparcelable:versionedparcelable:1.1.1"
+androidx-viewpager = "androidx.viewpager:viewpager:1.0.0"
+androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
+androidx-window = "androidx.window:window:1.0.0"
+androidx-work-work-runtime = { module = "androidx.work:work-runtime", version.ref = "androidx-work" }
+androidx-work-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work" }
+app-cash-turbine = "app.cash.turbine:turbine:0.12.1"
+com-airbnb-android-epoxy = "com.airbnb.android:epoxy:5.0.0-beta03"
+com-airbnb-android-epoxy-annotations = "com.airbnb.android:epoxy-annotations:5.0.0-beta03"
+com-airbnb-android-epoxy-databinding = "com.airbnb.android:epoxy-databinding:5.0.0-beta03"
+com-airbnb-android-epoxy-paging3 = "com.airbnb.android:epoxy-paging3:5.0.0-beta03"
+com-airbnb-android-epoxy-processor = "com.airbnb.android:epoxy-processor:5.0.0-beta03"
+com-airbnb-android-lottie = "com.airbnb.android:lottie:5.2.0"
+com-android-tools-build-gradle = "com.android.tools.build:gradle:7.3.0"
+com-apollographql-apollo3-apollo-annotations = { module = "com.apollographql.apollo3:apollo-annotations", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-annotations-jvm = { module = "com.apollographql.apollo3:apollo-annotations-jvm", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-api = { module = "com.apollographql.apollo3:apollo-api", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-api-jvm = { module = "com.apollographql.apollo3:apollo-api-jvm", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-mpp-utils = { module = "com.apollographql.apollo3:apollo-mpp-utils", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-mpp-utils-jvm = { module = "com.apollographql.apollo3:apollo-mpp-utils-jvm", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-runtime = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-runtime-jvm = { module = "com.apollographql.apollo3:apollo-runtime-jvm", version.ref = "com-apollographql-apollo3" }
+com-apollographql-apollo3-apollo-testing-support = { module = "com.apollographql.apollo3:apollo-testing-support", version.ref = "com-apollographql-apollo3" }
+com-atlassian-commonmark = "com.atlassian.commonmark:commonmark:0.13.0"
+com-benasher44-uuid = { module = "com.benasher44:uuid", version.ref = "com-benasher44" }
+com-benasher44-uuid-jvm = { module = "com.benasher44:uuid-jvm", version.ref = "com-benasher44" }
+com-github-bumptech-glide = { module = "com.github.bumptech.glide:glide", version.ref = "com-github-bumptech-glide" }
+com-github-bumptech-glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "com-github-bumptech-glide" }
+com-github-bumptech-glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "com-github-bumptech-glide" }
+com-github-bumptech-glide-disklrucache = { module = "com.github.bumptech.glide:disklrucache", version.ref = "com-github-bumptech-glide" }
+com-github-bumptech-glide-gifdecoder = { module = "com.github.bumptech.glide:gifdecoder", version.ref = "com-github-bumptech-glide" }
+com-github-bumptech-glide-okhttp3-integration = { module = "com.github.bumptech.glide:okhttp3-integration", version.ref = "com-github-bumptech-glide" }
+com-github-chuckerteam-chucker-library = { module = "com.github.chuckerteam.chucker:library", version.ref = "com-github-chuckerteam-chucker" }
+com-github-chuckerteam-chucker-library-no-op = { module = "com.github.chuckerteam.chucker:library-no-op", version.ref = "com-github-chuckerteam-chucker" }
+com-google-android-datatransport-transport-api = "com.google.android.datatransport:transport-api:3.0.0"
+com-google-android-datatransport-transport-backend-cct = "com.google.android.datatransport:transport-backend-cct:3.1.8"
+com-google-android-datatransport-transport-runtime = "com.google.android.datatransport:transport-runtime:3.1.8"
+com-google-android-exoplayer = { module = "com.google.android.exoplayer:exoplayer", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-common = { module = "com.google.android.exoplayer:exoplayer-common", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-core = { module = "com.google.android.exoplayer:exoplayer-core", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-dash = { module = "com.google.android.exoplayer:exoplayer-dash", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-database = { module = "com.google.android.exoplayer:exoplayer-database", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-datasource = { module = "com.google.android.exoplayer:exoplayer-datasource", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-decoder = { module = "com.google.android.exoplayer:exoplayer-decoder", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-extractor = { module = "com.google.android.exoplayer:exoplayer-extractor", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-hls = { module = "com.google.android.exoplayer:exoplayer-hls", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-rtsp = { module = "com.google.android.exoplayer:exoplayer-rtsp", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-smoothstreaming = { module = "com.google.android.exoplayer:exoplayer-smoothstreaming", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-exoplayer-ui = { module = "com.google.android.exoplayer:exoplayer-ui", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-extension-cast = { module = "com.google.android.exoplayer:extension-cast", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-extension-mediasession = { module = "com.google.android.exoplayer:extension-mediasession", version.ref = "com-google-android-exoplayer" }
+com-google-android-exoplayer-extension-okhttp = { module = "com.google.android.exoplayer:extension-okhttp", version.ref = "com-google-android-exoplayer" }
+com-google-android-gms-play-services-ads-identifier = "com.google.android.gms:play-services-ads-identifier:18.0.0"
+com-google-android-gms-play-services-base = "com.google.android.gms:play-services-base:18.0.1"
+com-google-android-gms-play-services-basement = "com.google.android.gms:play-services-basement:18.1.0"
+com-google-android-gms-play-services-cast = "com.google.android.gms:play-services-cast:21.0.1"
+com-google-android-gms-play-services-cast-framework = "com.google.android.gms:play-services-cast-framework:21.0.1"
+com-google-android-gms-play-services-flags = "com.google.android.gms:play-services-flags:18.0.1"
+com-google-android-gms-play-services-measurement = "com.google.android.gms:play-services-measurement:21.2.0"
+com-google-android-gms-play-services-measurement-api = "com.google.android.gms:play-services-measurement-api:21.2.0"
+com-google-android-gms-play-services-measurement-base = "com.google.android.gms:play-services-measurement-base:21.2.0"
+com-google-android-gms-play-services-measurement-impl = "com.google.android.gms:play-services-measurement-impl:21.2.0"
+com-google-android-gms-play-services-measurement-sdk = "com.google.android.gms:play-services-measurement-sdk:21.2.0"
+com-google-android-gms-play-services-measurement-sdk-api = "com.google.android.gms:play-services-measurement-sdk-api:21.2.0"
+com-google-android-gms-play-services-stats = "com.google.android.gms:play-services-stats:17.0.2"
+com-google-android-gms-play-services-tasks = "com.google.android.gms:play-services-tasks:18.0.1"
+com-google-android-libraries-mapsplatform-secrets-gradle-plugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
+com-google-android-material = "com.google.android.material:material:1.7.0"
+com-google-code-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
+com-google-code-gson = "com.google.code.gson:gson:2.9.0"
+com-google-dagger = "com.google.dagger:dagger:2.44"
+com-google-dagger-dagger-lint-aar = "com.google.dagger:dagger-lint-aar:2.44"
+com-google-dagger-hilt-android = "com.google.dagger:hilt-android:2.44"
+com-google-dagger-hilt-android-compiler = "com.google.dagger:hilt-android-compiler:2.44"
+com-google-dagger-hilt-android-gradle-plugin = "com.google.dagger:hilt-android-gradle-plugin:2.43.2"
+com-google-dagger-hilt-core = "com.google.dagger:hilt-core:2.44"
+com-google-errorprone-error_prone_annotations = "com.google.errorprone:error_prone_annotations:2.9.0"
+com-google-firebase-firebase-abt = "com.google.firebase:firebase-abt:21.0.2"
+com-google-firebase-firebase-analytics = "com.google.firebase:firebase-analytics:21.2.0"
+com-google-firebase-firebase-analytics-ktx = "com.google.firebase:firebase-analytics-ktx:21.2.0"
+com-google-firebase-firebase-annotations = "com.google.firebase:firebase-annotations:16.1.0"
+com-google-firebase-firebase-common = "com.google.firebase:firebase-common:20.2.0"
+com-google-firebase-firebase-common-ktx = "com.google.firebase:firebase-common-ktx:20.2.0"
+com-google-firebase-firebase-components = "com.google.firebase:firebase-components:17.0.1"
+com-google-firebase-firebase-config = "com.google.firebase:firebase-config:21.2.0"
+com-google-firebase-firebase-config-ktx = "com.google.firebase:firebase-config-ktx:21.2.0"
+com-google-firebase-firebase-crashlytics = "com.google.firebase:firebase-crashlytics:18.3.1"
+com-google-firebase-firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.9.2"
+com-google-firebase-firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics-ktx:18.3.1"
+com-google-firebase-firebase-encoders = "com.google.firebase:firebase-encoders:17.0.0"
+com-google-firebase-firebase-encoders-json = "com.google.firebase:firebase-encoders-json:18.0.0"
+com-google-firebase-firebase-encoders-proto = "com.google.firebase:firebase-encoders-proto:16.0.0"
+com-google-firebase-firebase-iid = "com.google.firebase:firebase-iid:19.0.0"
+com-google-firebase-firebase-iid-interop = "com.google.firebase:firebase-iid-interop:17.0.0"
+com-google-firebase-firebase-installations = "com.google.firebase:firebase-installations:17.0.3"
+com-google-firebase-firebase-installations-interop = "com.google.firebase:firebase-installations-interop:17.0.2"
+com-google-firebase-firebase-measurement-connector = "com.google.firebase:firebase-measurement-connector:19.0.0"
+com-google-firebase-firebase-messaging = "com.google.firebase:firebase-messaging:19.0.0"
+com-google-gms-google-services = "com.google.gms:google-services:4.3.14"
+com-google-guava = "com.google.guava:guava:31.0.1-android"
+com-google-guava-failureaccess = "com.google.guava:failureaccess:1.0.1"
+com-google-guava-listenablefuture = "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
+com-ms-square-expandableTextView = "com.ms-square:expandableTextView:0.1.4"
+com-onesignal-OneSignal = "com.onesignal:OneSignal:4.8.2"
+com-pinterest-ktlint = "com.pinterest:ktlint:0.43.2"
+com-pinterest-ktlint-ktlint-reporter-baseline = "com.pinterest.ktlint:ktlint-reporter-baseline:0.43.2"
+com-squareup-curtains = "com.squareup.curtains:curtains:1.2.4"
+com-squareup-leakcanary-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-android-core = { module = "com.squareup.leakcanary:leakcanary-android-core", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-android-utils = { module = "com.squareup.leakcanary:leakcanary-android-utils", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-object-watcher = { module = "com.squareup.leakcanary:leakcanary-object-watcher", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-object-watcher-android = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-object-watcher-android-androidx = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android-androidx", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-object-watcher-android-core = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android-core", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-leakcanary-object-watcher-android-support-fragments = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-plumber-android = { module = "com.squareup.leakcanary:plumber-android", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-plumber-android-core = { module = "com.squareup.leakcanary:plumber-android-core", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-shark = { module = "com.squareup.leakcanary:shark", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-shark-android = { module = "com.squareup.leakcanary:shark-android", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-shark-graph = { module = "com.squareup.leakcanary:shark-graph", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-shark-hprof = { module = "com.squareup.leakcanary:shark-hprof", version.ref = "com-squareup-leakcanary" }
+com-squareup-leakcanary-shark-log = { module = "com.squareup.leakcanary:shark-log", version.ref = "com-squareup-leakcanary" }
+com-squareup-okhttp3-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.4"
+com-squareup-okhttp3-okhttp = "com.squareup.okhttp3:okhttp:5.0.0-alpha.6"
+com-squareup-okhttp3-okhttp-bom = "com.squareup.okhttp3:okhttp-bom:3.12.10"
+com-squareup-okhttp3-okhttp-dnsoverhttps = "com.squareup.okhttp3:okhttp-dnsoverhttps:5.0.0-alpha.6"
+com-squareup-okhttp3-okhttp-jvm = "com.squareup.okhttp3:okhttp-jvm:5.0.0-alpha.6"
+com-squareup-okio = { module = "com.squareup.okio:okio", version.ref = "com-squareup-okio" }
+com-squareup-okio-okio-jvm = { module = "com.squareup.okio:okio-jvm", version.ref = "com-squareup-okio" }
+com-squareup-retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "com-squareup-retrofit2" }
+com-squareup-retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
+gradle-plugin-com-onesignal-onesignal-gradle-plugin = "gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.13.4"
+io-coil-kt-coil = { module = "io.coil-kt:coil", version.ref = "io-coil-kt" }
+io-coil-kt-coil-base = { module = "io.coil-kt:coil-base", version.ref = "io-coil-kt" }
+io-coil-kt-coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "io-coil-kt" }
+io-getstream-avatarview = { module = "io.getstream:avatarview", version.ref = "io-getstream" }
+io-getstream-avatarview-coil = { module = "io.getstream:avatarview-coil", version.ref = "io-getstream" }
+io-mockk = "io.mockk:mockk:1.12.7"
+io-noties-markwon-core = "io.noties.markwon:core:4.6.2"
+javax-inject-javax-inject = "javax.inject:javax.inject:1"
+junit = "junit:junit:4.13.2"
+org-apache-commons-commons-lang3 = "org.apache.commons:commons-lang3:3.11"
+org-apache-commons-commons-text = "org.apache.commons:commons-text:1.9"
+org-apache-logging-log4j-log4j-core = "org.apache.logging.log4j:log4j-core:2.17.1"
+org-jacoco-org-jacoco-ant = "org.jacoco:org.jacoco.ant:0.8.7"
+org-jetbrains-annotations = "org.jetbrains:annotations:13.0"
+org-jetbrains-kotlin-kotlin-android-extensions-runtime = { module = "org.jetbrains.kotlin:kotlin-android-extensions-runtime", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-annotation-processing-gradle = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-gradle", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-parcelize-compiler = { module = "org.jetbrains.kotlin:kotlin-parcelize-compiler", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-parcelize-runtime = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-stdlib-common = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlin-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "org-jetbrains-kotlin" }
+org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-core-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "org-jetbrains-kotlinx" }
+org-jsoup = "org.jsoup:jsoup:1.13.1"
+org-mockito-kotlin-mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0"
+org-mockito-mockito-core = "org.mockito:mockito-core:4.7.0"
+org-mozilla-rhino = "org.mozilla:rhino:1.7.14"
+
+[plugins]
+
+android = "android:7.3.0"
+android-library = "android-library:7.3.0"
+android-reporting = "android-reporting:7.3.0"
+androidx-navigation-safeargs = "androidx.navigation.safeargs:2.4.1"
+androidx-navigation-safeargs-kotlin = "androidx.navigation.safeargs.kotlin:2.4.1"
+com-android-application = "com.android.application:7.3.0"
+com-android-asset-pack = "com.android.asset-pack:7.3.0"
+com-android-asset-pack-bundle = "com.android.asset-pack-bundle:7.3.0"
+com-android-base = "com.android.base:7.3.0"
+com-android-dynamic-feature = "com.android.dynamic-feature:7.3.0"
+com-android-fused-library = "com.android.fused-library:7.3.0"
+com-android-internal-application = "com.android.internal.application:7.3.0"
+com-android-internal-asset-pack = "com.android.internal.asset-pack:7.3.0"
+com-android-internal-asset-pack-bundle = "com.android.internal.asset-pack-bundle:7.3.0"
+com-android-internal-dynamic-feature = "com.android.internal.dynamic-feature:7.3.0"
+com-android-internal-fused-library = "com.android.internal.fused-library:7.3.0"
+com-android-internal-library = "com.android.internal.library:7.3.0"
+com-android-internal-reporting = "com.android.internal.reporting:7.3.0"
+com-android-internal-test = "com.android.internal.test:7.3.0"
+com-android-internal-version-check = "com.android.internal.version-check:7.3.0"
+com-android-library = "com.android.library:7.3.0"
+com-android-lint = "com.android.lint:7.3.0"
+com-android-reporting = "com.android.reporting:7.3.0"
+com-android-test = "com.android.test:7.3.0"
+com-apollographql-apollo3 = "com.apollographql.apollo3:3.5.0"
+com-github-ben-manes-versions = "com.github.ben-manes.versions:0.41.0"
+com-google-android-libraries-mapsplatform-secrets-gradle-plugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:2.0.1"
+com-google-dagger-hilt-android = "com.google.dagger.hilt.android:2.43.2"
+com-google-firebase-crashlytics = "com.google.firebase.crashlytics:2.9.2"
+com-google-gms-google-services = "com.google.gms.google-services:4.3.14"
+com-onesignal-androidsdk-onesignal-gradle-plugin = "com.onesignal.androidsdk.onesignal-gradle-plugin:0.13.4"
+dagger-hilt-android-plugin = "dagger.hilt.android.plugin:2.43.2"
+kotlin = "kotlin:1.7.10"
+kotlin-android = "kotlin-android:1.7.10"
+kotlin-android-extensions = "kotlin-android-extensions:1.7.10"
+kotlin-kapt = "kotlin-kapt:1.7.10"
+kotlin-multiplatform = "kotlin-multiplatform:1.7.10"
+kotlin-native-cocoapods = "kotlin-native-cocoapods:1.7.10"
+kotlin-native-performance = "kotlin-native-performance:1.7.10"
+kotlin-parcelize = "kotlin-parcelize:1.7.10"
+kotlin-platform-android = "kotlin-platform-android:1.7.10"
+kotlin-platform-common = "kotlin-platform-common:1.7.10"
+kotlin-platform-js = "kotlin-platform-js:1.7.10"
+kotlin-platform-jvm = "kotlin-platform-jvm:1.7.10"
+kotlin-scripting = "kotlin-scripting:1.7.10"
+nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.7.0"
+org-jetbrains-kotlin-android = "org.jetbrains.kotlin.android:1.7.10"
+org-jetbrains-kotlin-android-extensions = "org.jetbrains.kotlin.android.extensions:1.7.10"
+org-jetbrains-kotlin-js = "org.jetbrains.kotlin.js:1.7.10"
+org-jetbrains-kotlin-jvm = "org.jetbrains.kotlin.jvm:1.7.10"
+org-jetbrains-kotlin-kapt = "org.jetbrains.kotlin.kapt:1.7.10"
+org-jetbrains-kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:1.7.10"
+org-jetbrains-kotlin-multiplatform-pm20 = "org.jetbrains.kotlin.multiplatform.pm20:1.7.10"
+org-jetbrains-kotlin-native-cocoapods = "org.jetbrains.kotlin.native.cocoapods:1.7.10"
+org-jetbrains-kotlin-native-performance = "org.jetbrains.kotlin.native.performance:1.7.10"
+org-jetbrains-kotlin-platform-android = "org.jetbrains.kotlin.platform.android:1.7.10"
+org-jetbrains-kotlin-platform-common = "org.jetbrains.kotlin.platform.common:1.7.10"
+org-jetbrains-kotlin-platform-js = "org.jetbrains.kotlin.platform.js:1.7.10"
+org-jetbrains-kotlin-platform-jvm = "org.jetbrains.kotlin.platform.jvm:1.7.10"
+org-jetbrains-kotlin-plugin-parcelize = "org.jetbrains.kotlin.plugin.parcelize:1.7.10"
+org-jetbrains-kotlin-plugin-scripting = "org.jetbrains.kotlin.plugin.scripting:1.7.10"
+org-jlleitschuh-gradle-ktlint = "org.jlleitschuh.gradle.ktlint:11.0.0"
diff --git a/scrapper/.gitignore b/scrapper/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/scrapper/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/scrapper/build.gradle b/scrapper/build.gradle
new file mode 100644
index 00000000..13bf4b94
--- /dev/null
+++ b/scrapper/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'com.kl3jvi.scrapper'
+    compileSdk 32
+
+    defaultConfig {
+        minSdk 21
+        targetSdk 32
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}
\ No newline at end of file
diff --git a/scrapper/consumer-rules.pro b/scrapper/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/scrapper/proguard-rules.pro b/scrapper/proguard-rules.pro
new file mode 100644
index 00000000..d99b33c9
--- /dev/null
+++ b/scrapper/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/scrapper/src/androidTest/java/com/kl3jvi/scrapper/ExampleInstrumentedTest.kt b/scrapper/src/androidTest/java/com/kl3jvi/scrapper/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..d3984d21
--- /dev/null
+++ b/scrapper/src/androidTest/java/com/kl3jvi/scrapper/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.kl3jvi.scrapper
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.kl3jvi.scrapper.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/scrapper/src/main/AndroidManifest.xml b/scrapper/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/scrapper/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/scrapper/src/main/java/com/kl3jvi/scrapper/parser/BaseParser.kt b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/BaseParser.kt
new file mode 100644
index 00000000..17be4aa4
--- /dev/null
+++ b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/BaseParser.kt
@@ -0,0 +1,8 @@
+package com.kl3jvi.scrapper.parser
+
+abstract class BaseParser {
+    abstract fun fetchEpisodeList(response: String): List<EpisodeModel>
+    abstract fun getMediaUrls(response: String): List<String>
+    abstract fun parseAnimeInfo(response: String): AnimeInfoModel
+    abstract fun parseEncryptedUrls(response: String): List<String>
+}
diff --git a/scrapper/src/main/java/com/kl3jvi/scrapper/parser/EncryptionHelpers.kt b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/EncryptionHelpers.kt
new file mode 100644
index 00000000..21dea675
--- /dev/null
+++ b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/EncryptionHelpers.kt
@@ -0,0 +1,6 @@
+package com.kl3jvi.scrapper.parser
+
+interface EncryptionHelpers {
+    fun encryptAes(text: String, key: String, iv: String): String
+    fun decryptAES(encrypted: String, key: String, iv: String): String
+}
\ No newline at end of file
diff --git a/scrapper/src/main/java/com/kl3jvi/scrapper/parser/GoGoParser.kt b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/GoGoParser.kt
new file mode 100644
index 00000000..ce49533f
--- /dev/null
+++ b/scrapper/src/main/java/com/kl3jvi/scrapper/parser/GoGoParser.kt
@@ -0,0 +1,7 @@
+package com.kl3jvi.scrapper.parser
+
+class GoGoParser constructor(
+
+) : BaseParser(), EncryptionHelpers {
+
+}
\ No newline at end of file
diff --git a/scrapper/src/test/java/com/kl3jvi/scrapper/ExampleUnitTest.kt b/scrapper/src/test/java/com/kl3jvi/scrapper/ExampleUnitTest.kt
new file mode 100644
index 00000000..3698c30d
--- /dev/null
+++ b/scrapper/src/test/java/com/kl3jvi/scrapper/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.kl3jvi.scrapper
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 71%
rename from settings.gradle
rename to settings.gradle.kts
index 6ff282ba..40a961b2 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -1,11 +1,13 @@
+enableFeaturePreview("VERSION_CATALOGS")
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
         mavenCentral()
         jcenter() // Warning: this repository is going to shut down soon
-        maven { url 'https://www.jitpack.io' }
+        maven(url = "https://www.jitpack.io")
     }
 }
 rootProject.name = "Animity"
-include ':app'
+include (":app")