diff --git a/src/HomeAssistant/Controller/Bedroom.hs b/src/HomeAssistant/Controller/Bedroom.hs
index 75afcb7..62bebe3 100644
--- a/src/HomeAssistant/Controller/Bedroom.hs
+++ b/src/HomeAssistant/Controller/Bedroom.hs
@@ -62,7 +62,7 @@ bedroomPresenceController = proc x -> do
          callService (activateSceneWith "scene.makuuhuone_lepotila" transition) -< ()
        _ -> returnA -< ()
   where
-    transition = Just $ object ["transition" .= (5 :: Int)]
+    transition = Just $ object ["transition" .= (10 :: Int)]
 
 
 data BedroomControls
@@ -86,22 +86,24 @@ bedroomButtonController = proc x -> do
   -- Any event will cause the sleep mode to be turned off
   case ev of
        Event (Masse (OnButton ShortRelease)) -> do
-         callService (activateScene "scene.makuuhuone_masse") -< ()
+         callService (activateSceneWith "scene.makuuhuone_masse" transition) -< ()
        Event (Masse (OnButton DoubleClick)) -> do
-         callService (activateScene "scene.makuuhuone_keski") -< ()
+         callService (activateSceneWith "scene.makuuhuone_keski" transition) -< ()
        Event (Masse (OnButton LongClick)) -> do
-         callService (activateScene "scene.makuuhuone_kirkas") -< ()
+         callService (activateSceneWith "scene.makuuhuone_kirkas" transition) -< ()
        Event (Masse (OffButton _)) -> do
          callService (light [AreaId "makuuhuone"] Off) -< ()
        Event (Enishen (OnButton ShortRelease)) -> do
-         callService (activateScene "scene.makuuhuone_jemina") -< ()
+         callService (activateSceneWith "scene.makuuhuone_jemina" transition) -< ()
        Event (Enishen (OnButton DoubleClick)) -> do
-         callService (activateScene "scene.makuuhuone_keski") -< ()
+         callService (activateSceneWith "scene.makuuhuone_keski" transition) -< ()
        Event (Enishen (OnButton LongClick)) -> do
-         callService (activateScene "scene.makuuhuone_kirkas") -< ()
+         callService (activateSceneWith "scene.makuuhuone_kirkas" transition) -< ()
        Event (Enishen (OffButton _)) -> do
          callService (light [AreaId "makuuhuone"] Off) -< ()
        _ -> returnA -< ()
+  where
+    transition = Just $ object ["transition" .= (5 :: Int)]