diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 4bec4ea..7643783 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
@@ -113,5 +116,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..6e6eec1 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..fcb19bf 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="18" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 2db9602..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_33_arm64-v8a.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-10T17:43:36.282896Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 20ad4d6..3f96892 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="corretto-18" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 45921f2..a448f44 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="Gradle Central Plugin Repository" />
+      <option name="name" value="Gradle Central Plugin Repository" />
+      <option name="url" value="https://plugins.gradle.org/m2" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
new file mode 100644
index 0000000..786189d
--- /dev/null
+++ b/.idea/kotlinScripting.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinScriptingSettings">
+    <scriptDefinition className="org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate" definitionName="KotlinSettingsScript">
+      <order>2147483647</order>
+    </scriptDefinition>
+    <scriptDefinition className="org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate" definitionName="KotlinBuildScript">
+      <order>2147483647</order>
+    </scriptDefinition>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9f71c83..e9e9db5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" 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
deleted file mode 100644
index bb6d50f..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,120 +0,0 @@
-import net.deaftone.buildSrc.Deps
-
-/*plugins {
-    id 'com.google.devtools.ksp'
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id "kotlin-kapt"
-    id 'com.google.dagger.hilt.android'
-}*/
-plugins {
-    id "com.android.application"
-    id "dagger.hilt.android.plugin"
-    id "kotlin-android"
-    id "kotlin-kapt"
-    id "kotlin-parcelize"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "androidx.navigation.safeargs.kotlin"
-}
-
-android {
-    namespace 'net.deaftone.eurydice'
-
-    defaultConfig {
-        applicationId "net.deaftone.eurydice"
-        minSdk 21
-        compileSdkVersion 33
-        targetSdk 33
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-    }
-
-    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'
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion "${Deps.Android.Compose.compilerVersion}"
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-}
-kapt {
-    correctErrorTypes true
-}
-dependencies {
-    api(Deps.Android.Room.runtime)
-    api(Deps.Android.Room.paging)
-    api(Deps.Android.Room.ktx)
-    kapt(Deps.Android.Room.compiler)
-
-    api(Deps.Landscapist.landscapistGlide)
-    api(Deps.Landscapist.landscapistPlaceholder)
-
-    api(Deps.Retrofit.retrofit)
-    api(Deps.Retrofit.retrofitMoshi)
-
-    // Moshi
-    api(Deps.Moshi.moshi)
-    api(Deps.Moshi.moshiKotlin)
-
-    api(Deps.OkHttp.logger)
-
-    api(Deps.Dagger.hilt)
-    kapt(Deps.Dagger.hiltCompiler)
-    kapt(Deps.Dagger.compiler)
-    api(Deps.Android.navigationHiltCompose)
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-
-    // Kotlin
-    implementation "androidx.navigation:navigation-fragment-ktx:2.5.3"
-    implementation "androidx.navigation:navigation-ui-ktx:2.5.3"
-
-    // Feature module Support
-    implementation "androidx.navigation:navigation-dynamic-features-fragment:2.5.3"
-
-    // Testing Navigation
-    androidTestImplementation "androidx.navigation:navigation-testing:2.5.3"
-
-    // Jetpack Compose Integration
-    implementation "androidx.navigation:navigation-compose:2.5.3"
-
-    implementation "com.google.accompanist:accompanist-navigation-animation:0.25.0"
-
-    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-    implementation 'androidx.activity:activity-compose:1.7.0'
-    implementation "androidx.compose.ui:ui:1.4.1"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.4.1"
-    implementation 'androidx.compose.material3:material3:1.1.0-beta02'
-    implementation "androidx.lifecycle:lifecycle-runtime-compose:1.4.1"
-    implementation 'com.github.bumptech.glide:glide:4.15.1'
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.1"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.4.1"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.1"
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..7060d22
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,62 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("dagger.hilt.android.plugin")
+    id("kotlin-parcelize")
+    kotlin("kapt")
+}
+
+android {
+    namespace  = "net.deaftone.eurydice"
+    compileSdk = 34
+    defaultConfig {
+        applicationId = "net.deaftone.eurydice"
+        minSdk = 24
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
+    }
+    kotlinOptions {
+        jvmTarget = "18"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    retrofit()
+    room()
+    hilt()
+    compose()
+    moshi()
+    activity()
+    navigation()
+    glide()
+    lifecycle()
+    implementation("com.squareup:javapoet:1.13.0")
+    implementation("com.google.dagger:hilt-android-gradle-plugin:2.45")
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..ff59496 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.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/java/net/deaftone/eurydice/ui/BottomSheet.kt b/app/src/main/java/net/deaftone/eurydice/ui/BottomSheet.kt
new file mode 100644
index 0000000..29af919
--- /dev/null
+++ b/app/src/main/java/net/deaftone/eurydice/ui/BottomSheet.kt
@@ -0,0 +1,69 @@
+package net.deaftone.eurydice.ui
+
+import androidx.compose.animation.*
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+
+@Composable
+fun BottomSheet(
+    peekHeight: Dp,
+    peekContent: @Composable () -> Unit,
+    content: @Composable () -> Unit,
+   // swipeableState: SwipeableState<Int> = rememberSwipeableState(initialValue = 0)
+) {
+    BoxWithConstraints(Modifier.fillMaxSize()) {
+        val density = LocalDensity.current
+        val anchors = mapOf(
+            0f to 1,
+            with(density) { (maxHeight - peekHeight).toPx() } to 0
+        )
+/*        val peekContentAlpha = remember {
+            derivedStateOf {
+                if (swipeableState.progress.from == 0){
+                    // at 0 or moving away from 0
+                    if (swipeableState.progress.to == 0) 1f
+                    else if (swipeableState.progress.fraction < 0.25f) 1f-swipeableState.progress.fraction*4
+                    else 0f
+                } else {
+                    // at 1 or moving away from 1
+                    if (swipeableState.progress.to == 1) 0f
+                    else if (swipeableState.progress.fraction > 0.75f) 1f-(1f-swipeableState.progress.fraction)*4
+                    else 0f
+                }
+            }
+        }*/
+/*        Box(
+            modifier = Modifier
+                .graphicsLayer {
+                    translationY = swipeableState.offset.value
+                }
+                .fillMaxSize()
+                .align(Alignment.BottomCenter)
+                .swipeable(
+                    state = swipeableState,
+                    anchors = anchors,
+                    orientation = Orientation.Vertical
+                )
+        ) {
+            *//**
+             * Order of composable matters.
+             * Reversed order would result in clickables in peekContent not working.
+             * Note that the composable will overlap. Check state before reacting to a click.
+             *//*
+            Box(Modifier.graphicsLayer { alpha = 1f-peekContentAlpha.value }){
+                content()
+            }
+            Box(Modifier.graphicsLayer { alpha = peekContentAlpha.value }) {
+                peekContent()
+            }
+        }*/
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/deaftone/eurydice/ui/MainActivity.kt b/app/src/main/java/net/deaftone/eurydice/ui/MainActivity.kt
index c18ccf5..f0ca7ab 100644
--- a/app/src/main/java/net/deaftone/eurydice/ui/MainActivity.kt
+++ b/app/src/main/java/net/deaftone/eurydice/ui/MainActivity.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import net.deaftone.eurydice.R
 import net.deaftone.eurydice.ui.navigation.BottomBar
@@ -44,7 +44,7 @@ class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    NavScreen(navController = rememberAnimatedNavController())
+                    NavScreen(navController = rememberNavController())
                 }
             }
         }
@@ -66,7 +66,7 @@ fun MainActivityPreview() {
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
 @Composable
-fun NavScreen(navController: NavHostController = rememberAnimatedNavController()) {
+fun NavScreen(navController: NavHostController = rememberNavController()) {
     val hidden = listOf(
         MainScreenRoutes.AlbumInfo
     )
diff --git a/app/src/main/java/net/deaftone/eurydice/ui/navigation/MainScreenNavGraph.kt b/app/src/main/java/net/deaftone/eurydice/ui/navigation/MainScreenNavGraph.kt
index 5ea881e..a92aceb 100644
--- a/app/src/main/java/net/deaftone/eurydice/ui/navigation/MainScreenNavGraph.kt
+++ b/app/src/main/java/net/deaftone/eurydice/ui/navigation/MainScreenNavGraph.kt
@@ -1,12 +1,13 @@
 package net.deaftone.eurydice.ui.navigation
 
 import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import net.deaftone.eurydice.ui.TestScreen1
 import net.deaftone.eurydice.ui.album.AlbumInfoScreen
 import net.deaftone.eurydice.ui.album.AlbumListScreen
@@ -17,18 +18,18 @@ fun MainScreenNavGraph(
     navController: NavHostController,
     modifier: Modifier = Modifier
 ) {
-    AnimatedNavHost(
+    NavHost(
         modifier = modifier,
         navController = navController,
         route = NavGraph.BOTTOM_BAR_GRAPH,
         startDestination = BottomBarScreen.AlbumList.route,
-        enterTransition = { slideIntoContainer(AnimatedContentScope.SlideDirection.Right) },
-        exitTransition = { slideOutOfContainer(towards = AnimatedContentScope.SlideDirection.Left) },
+        enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Right) },
+        exitTransition = { slideOutOfContainer(towards = AnimatedContentTransitionScope.SlideDirection.Left) },
         popEnterTransition = {
-            slideIntoContainer(towards = AnimatedContentScope.SlideDirection.Right)
+            slideIntoContainer(towards = AnimatedContentTransitionScope.SlideDirection.Right)
         },
         popExitTransition = {
-            slideOutOfContainer(towards = AnimatedContentScope.SlideDirection.Left)
+            slideOutOfContainer(towards = AnimatedContentTransitionScope.SlideDirection.Left)
         }
 
     ) {
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 76513b8..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-import net.deaftone.buildSrc.Deps
-buildscript {
-    repositories {
-        maven { url 'https://maven.fabric.io/public' }
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        mavenCentral()
-        google()
-    }
-    dependencies {
-        classpath Deps.Android.gradle
-        classpath Deps.Kotlin.gradle
-        classpath Deps.Kotlin.serialization
-        classpath Deps.Android.navigationSafeArgs
-        classpath Deps.Dagger.hiltGradle
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
-    }
-}
-
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://androidx.dev/snapshots/builds/8020137/artifacts/repository' }
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        maven { url 'https://jitpack.io' }
-        jcenter()
-    }
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-        kotlinOptions {
-            jvmTarget = "1.8"
-
-            freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
-            freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
-        }
-    }
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..51e3c81
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,10 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath(Dependencies.hiltAgp)
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3055e57..a41d337 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,16 @@
 plugins {
     `kotlin-dsl`
 }
+
 repositories {
+    google()
     mavenCentral()
-    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("com.squareup:javapoet:1.13.0")
+
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+    implementation("com.android.tools.build:gradle:8.1.1")
+
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
similarity index 57%
rename from buildSrc/src/main/java/Dependencies.kt
rename to buildSrc/src/main/kotlin/Dependencies.kt
index fdb9cbb..7673768 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,5 +1,6 @@
-package net.deaftone.buildSrc
-object Deps {
+import org.gradle.api.artifacts.dsl.DependencyHandler
+
+/*object Deps {
     object Gradle {
         const val dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:2.0.0"
         const val playPublisher = "com.github.triplet.gradle:play-publisher:3.7.0"
@@ -29,6 +30,7 @@ object Deps {
 
         const val activityVersion = "1.7.0"
         const val activityKtx = "androidx.activity:activity-ktx:$activityVersion"
+        const val activityCompose = "androidx.activity:activity-compose:$activityVersion"
 
         private const val navigationVersion = "2.5.3"
         const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
@@ -46,7 +48,7 @@ object Deps {
             const val uiTooling = "androidx.compose.ui:ui-tooling:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val material = "androidx.compose.material:material:$version"
-            const val material3 = "androidx.compose.material3:material3:1.1.0-beta02"
+            const val material3 = "androidx.compose.material3:material3:1.2.0-alpha02"
             const val materialIcons = "androidx.compose.material:material-icons-core:$version"
             const val materialIconsExtended = "androidx.compose.material:material-icons-extended:$version"
             const val constraintLayout = "androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha03"
@@ -137,17 +139,6 @@ object Deps {
         const val moshi = "com.squareup.moshi:moshi:$version"
         const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:$version"
     }
-    object Dagger {
-        private const val version = "2.44"
-
-        const val dagger = "com.google.dagger:dagger:$version"
-        const val compiler = "com.google.dagger:dagger-compiler:$version"
-
-        const val hilt = "com.google.dagger:hilt-android:$version"
-        const val hiltCompiler = "com.google.dagger:hilt-compiler:$version"
-        const val hiltGradle = "com.google.dagger:hilt-android-gradle-plugin:$version"
-        const val hiltTesting = "com.google.dagger:hilt-android-testing:$version"
-    }
 
     object Testing {
         const val junit = "junit:junit:4.13.2"
@@ -158,4 +149,109 @@ object Deps {
         const val mockk = "io.mockk:mockk:1.12.8"
         const val turbine = "app.cash.turbine:turbine:0.8.0"
     }
+
+}
+*/
+
+
+object Dependencies {
+    const val activityKtx = "androidx.activity:activity-ktx:$${Versions.activityVersion}"
+    const val activityCompose = "androidx.activity:activity-compose:${Versions.activityVersion}"
+
+    const val composeMaterial = "androidx.compose.material3:material3:${Versions.composeMaterial3}"
+    const val composeUi = "androidx.compose.ui:ui:${Versions.compose}"
+    const val composeUiGraphics = "androidx.compose.ui:ui-graphics:${Versions.compose}"
+    const val composeUiTooling = "androidx.compose.ui:ui-tooling:${Versions.compose}"
+    const val composeUiToolingPreview = "androidx.compose.ui:ui-tooling-preview:${Versions.compose}"
+    const val composeRuntime = "androidx.compose.runtime:runtime:${Versions.compose}"
+
+    const val hiltAndroid = "com.google.dagger:hilt-android:${Versions.hilt}"
+    const val hiltCompiler = "com.google.dagger:hilt-android-compiler:${Versions.hilt}"
+    const val hiltAgp = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}"
+    const val hiltNavigation = "androidx.hilt:hilt-navigation-compose:${Versions.hiltCompose}"
+
+    const val okHttp = "com.squareup.okhttp3:okhttp:${Versions.okHttp}"
+    const val okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.okHttp}"
+
+    const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
+    const val moshiConverter = "com.squareup.retrofit2:converter-moshi:${Versions.retrofit}"
+
+    const val roomRuntime = "androidx.room:room-runtime:${Versions.room}"
+    const val roomCompiler = "androidx.room:room-compiler:${Versions.room}"
+    const val roomKtx = "androidx.room:room-ktx:${Versions.room}"
+
+    const val moshi = "com.squareup.moshi:moshi:${Versions.moshi}"
+    const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}"
+
+    const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
+    const val navigationUI = "androidx.navigation:navigation-ui-ktx:${Versions.navigation}"
+    const val navigationFeatures = "androidx.navigation:navigation-dynamic-features-fragment:${Versions.navigation}"
+    const val navigationTesting = "androidx.navigation:navigation-testing:${Versions.navigation}"
+    const val navigationCompose = "androidx.navigation:navigation-compose:${Versions.navigation}"
+    const val accomNavigationMaterial = "com.google.accompanist:accompanist-navigation-material:0.33.2-alpha"
+    const val accomNavigationAnimation = "com.google.accompanist:accompanist-navigation-animation:0.33.2-alpha"
+
+    const val landscapistGlide = "com.github.skydoves:landscapist-glide:${Versions.glide}"
+    const val landscapistPlaceholder = "com.github.skydoves:landscapist-placeholder:${Versions.glide}"
+
+    const val lifeCycleRuntime = "androidx.lifecycle:lifecycle-runtime:${Versions.lifeCycle}"
+    const val lifeCycleRuntimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:${Versions.lifeCycle}"
+
+    const val androidAnimation = "androidx.compose.animation:animation:1.5.3"
+    const val javaPoet = "com.squareup:javapoet:1.13.0"
+}
+fun DependencyHandler.room() {
+    implementation(Dependencies.roomRuntime)
+    implementation(Dependencies.roomKtx)
+    kapt(Dependencies.roomCompiler)
+}
+
+fun DependencyHandler.retrofit() {
+    implementation(Dependencies.retrofit)
+    implementation(Dependencies.moshiConverter)
+    implementation(Dependencies.okHttp)
+    implementation(Dependencies.okHttpLoggingInterceptor)
+}
+
+fun DependencyHandler.compose() {
+    implementation(Dependencies.composeUi)
+    implementation(Dependencies.composeRuntime)
+    implementation(Dependencies.composeUiGraphics)
+    implementation(Dependencies.composeUiTooling)
+    implementation(Dependencies.composeMaterial)
+    implementation(Dependencies.hiltNavigation)
+    debugImplementation(Dependencies.composeUiToolingPreview)
+}
+
+fun DependencyHandler.navigation() {
+    implementation(Dependencies.navigationFragment)
+    implementation(Dependencies.navigationUI)
+    implementation(Dependencies.navigationFeatures)
+    implementation(Dependencies.navigationCompose)
+    implementation(Dependencies.androidAnimation)
+}
+
+fun DependencyHandler.moshi() {
+    implementation(Dependencies.moshi)
+    implementation(Dependencies.moshiConverter)
+    implementation(Dependencies.moshiKotlin)
+}
+fun DependencyHandler.activity() {
+    implementation(Dependencies.activityCompose)
+    implementation(Dependencies.activityKtx)
+}
+
+fun DependencyHandler.glide() {
+    implementation(Dependencies.landscapistGlide)
+    implementation(Dependencies.landscapistPlaceholder)
+}
+
+fun DependencyHandler.lifecycle(){
+    implementation(Dependencies.lifeCycleRuntime)
+    implementation(Dependencies.lifeCycleRuntimeCompose)
+}
+
+fun DependencyHandler.hilt() {
+    implementation(Dependencies.hiltAndroid)
+    kapt(Dependencies.hiltCompiler)
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/DependencyHandlerExt.kt b/buildSrc/src/main/kotlin/DependencyHandlerExt.kt
new file mode 100644
index 0000000..617307f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/DependencyHandlerExt.kt
@@ -0,0 +1,23 @@
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.dsl.DependencyHandler
+
+
+fun DependencyHandler.implementation(dependency: String) {
+    add("implementation", dependency)
+}
+
+fun DependencyHandler.implementation(dependency: Dependency) {
+    add("implementation", dependency)
+}
+
+fun DependencyHandler.test(dependency: String) {
+    add("test", dependency)
+}
+
+fun DependencyHandler.debugImplementation(dependency: String) {
+    add("debugImplementation", dependency)
+}
+
+fun DependencyHandler.kapt(dependency: String) {
+    add("kapt", dependency)
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
new file mode 100644
index 0000000..95af00f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,15 @@
+object Versions {
+    const val compose = "1.4.3"
+    const val composeMaterial3 = "1.1.1"
+    const val composeCompiler = "1.4.6"
+    const val hilt = "2.45"
+    const val okHttp = "5.0.0-alpha.2"
+    const val retrofit = "2.9.0"
+    const val room = "2.5.0"
+    const val moshi = "1.9.3"
+    const val navigation = "2.7.4"
+    const val activityVersion = "1.7.0"
+    const val hiltCompose = "1.0.0"
+    const val glide = "2.1.10"
+    const val lifeCycle = "2.6.1"
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9d88a44..2cbd6d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,3 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 9d495b3..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..2855fce
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Eurydice"
+include(":app")
\ No newline at end of file