diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
index b2fd53f..edc8475 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez.screens.session.SessionScreens
+package be.ugent.sel.studeez.screens.session.sessionScreens
 
 import androidx.compose.runtime.Composable
 import be.ugent.sel.studeez.R
@@ -8,7 +8,7 @@ import be.ugent.sel.studeez.R.string as AppText
 
 class BreakSessionScreen(
     private val funPomoDoroTimer: FunctionalPomodoroTimer
-): SessionScreen(funPomoDoroTimer) {
+): AbstractSessionScreen() {
 
     @Composable
     override fun motivationString(): String {
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
index 92c2b5e..36ee492 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez.screens.session.SessionScreens
+package be.ugent.sel.studeez.screens.session.sessionScreens
 
 import androidx.compose.runtime.Composable
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalCustomTimer
@@ -8,7 +8,7 @@ import be.ugent.sel.studeez.R.string as AppText
 
 class CustomSessionScreen(
     private val functionalTimer: FunctionalCustomTimer
-): SessionScreen(functionalTimer) {
+): AbstractSessionScreen() {
 
     @Composable
     override fun motivationString(): String {
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/EndlessSessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/EndlessSessionScreen.kt
index 688243b..fc46c9d 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/EndlessSessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/EndlessSessionScreen.kt
@@ -1,14 +1,11 @@
-package be.ugent.sel.studeez.screens.session.SessionScreens
+package be.ugent.sel.studeez.screens.session.sessionScreens
 
 import androidx.compose.runtime.Composable
-import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalEndlessTimer
 import be.ugent.sel.studeez.resources
 import be.ugent.sel.studeez.R.string as AppText
 
 
-class EndlessSessionScreen(
-    functionalTimer: FunctionalEndlessTimer
-    ): SessionScreen(functionalTimer) {
+class EndlessSessionScreen : AbstractSessionScreen() {
 
     @Composable
     override fun motivationString(): String {