diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/AppCardRow.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/AppCardRow.kt
index a7658f9..e034f7d 100644
--- a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/AppCardRow.kt
+++ b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/AppCardRow.kt
@@ -6,11 +6,11 @@ import androidx.compose.runtime.getValue
 import androidx.tv.foundation.lazy.list.items
 import nl.ndat.tvlauncher.data.repository.AppRepository
 import nl.ndat.tvlauncher.ui.component.card.AppCard
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @Composable
 fun AppCardRow() {
-	val appRepository = rememberKoinInject<AppRepository>()
+	val appRepository = koinInject<AppRepository>()
 	val apps by appRepository.getApps().collectAsState(initial = emptyList())
 
 	CardRow {
diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/ChannelProgramCardRow.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/ChannelProgramCardRow.kt
index 04a2ff4..74734f3 100644
--- a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/ChannelProgramCardRow.kt
+++ b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/row/ChannelProgramCardRow.kt
@@ -16,14 +16,14 @@ import nl.ndat.tvlauncher.data.repository.ChannelRepository
 import nl.ndat.tvlauncher.data.sqldelight.App
 import nl.ndat.tvlauncher.data.sqldelight.Channel
 import nl.ndat.tvlauncher.ui.component.card.ChannelProgramCard
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @Composable
 fun ChannelProgramCardRow(
 	channel: Channel,
 ) {
-	val channelRepository = rememberKoinInject<ChannelRepository>()
-	val appRepository = rememberKoinInject<AppRepository>()
+	val channelRepository = koinInject<ChannelRepository>()
+	val appRepository = koinInject<AppRepository>()
 	val programs by channelRepository.getProgramsByChannel(channel).collectAsState(initial = emptyList())
 
 	var app by remember { mutableStateOf<App?>(null) }
diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/page/LauncherPage.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/page/LauncherPage.kt
index 6698c99..4ef6c0d 100644
--- a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/page/LauncherPage.kt
+++ b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/page/LauncherPage.kt
@@ -14,11 +14,11 @@ import nl.ndat.tvlauncher.data.repository.ChannelRepository
 import nl.ndat.tvlauncher.ui.component.row.AppCardRow
 import nl.ndat.tvlauncher.ui.component.row.ChannelProgramCardRow
 import nl.ndat.tvlauncher.ui.toolbar.Toolbar
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @Composable
 fun LauncherPage() {
-	val channelRepository = rememberKoinInject<ChannelRepository>()
+	val channelRepository = koinInject<ChannelRepository>()
 	val channels by channelRepository.getChannels().collectAsState(initial = emptyList())
 
 	TvLazyColumn(
diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/Toolbar.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/Toolbar.kt
index 6b3cafd..18662cc 100644
--- a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/Toolbar.kt
+++ b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/Toolbar.kt
@@ -16,14 +16,14 @@ import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.unit.dp
 import nl.ndat.tvlauncher.data.model.ToolbarLocation
 import nl.ndat.tvlauncher.data.repository.PreferenceRepository
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun Toolbar(
 	modifier: Modifier = Modifier,
 ) {
-	val preferenceRepository = rememberKoinInject<PreferenceRepository>()
+	val preferenceRepository = koinInject<PreferenceRepository>()
 	val location by preferenceRepository.toolbarLocation.collectAsState()
 
 	Column(
diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/ToolbarInputsButton.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/ToolbarInputsButton.kt
index c779a15..da7fd7d 100644
--- a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/ToolbarInputsButton.kt
+++ b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/toolbar/ToolbarInputsButton.kt
@@ -18,11 +18,11 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import nl.ndat.tvlauncher.R
 import nl.ndat.tvlauncher.data.repository.InputRepository
-import org.koin.compose.rememberKoinInject
+import org.koin.compose.koinInject
 
 @Composable
 fun ToolbarInputsButton() {
-	val inputRepository = rememberKoinInject<InputRepository>()
+	val inputRepository = koinInject<InputRepository>()
 	val inputs by inputRepository.getInputs().collectAsState(initial = emptyList())
 	val context = LocalContext.current