diff --git a/app/build.gradle b/app/build.gradle
index 80b8a5f..17eccd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.halil.ozel.exoplayerscreenlock"
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -41,6 +41,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    // ExoPlayer
-    implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
-}
\ No newline at end of file
+    // Media3 (modern ExoPlayer)
+    implementation 'androidx.media3:media3-exoplayer:1.8.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.8.1'
+    implementation 'androidx.media3:media3-ui:1.8.1'
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04a0277..5069f8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -12,9 +11,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ExoPlayerScreenLock">
         <activity
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"
-            android:configChanges="orientation|screenSize|screenLayout"
             android:name=".MainActivity"
+            android:configChanges="orientation|screenSize|screenLayout"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -24,4 +22,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/halil/ozel/exoplayerscreenlock/MainActivity.kt b/app/src/main/java/com/halil/ozel/exoplayerscreenlock/MainActivity.kt
index accfdeb..c3f92d4 100644
--- a/app/src/main/java/com/halil/ozel/exoplayerscreenlock/MainActivity.kt
+++ b/app/src/main/java/com/halil/ozel/exoplayerscreenlock/MainActivity.kt
@@ -7,152 +7,228 @@ import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.media3.common.MediaItem
+import androidx.media3.exoplayer.ExoPlayer
 import com.halil.ozel.exoplayerscreenlock.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
-    private var playbackPosition = 0L
-
     private lateinit var binding: ActivityMainBinding
-    private var exoPlayer: ExoPlayer? = null
-    private lateinit var imageViewFullScreen: ImageView
-    private lateinit var imageViewLock: ImageView
-    private lateinit var linearLayoutControlUp: LinearLayout
-    private lateinit var linearLayoutControlBottom: LinearLayout
+    private var player: ExoPlayer? = null
+
+    private lateinit var fullScreenButton: ImageView
+    private lateinit var lockButton: ImageView
+    private lateinit var topControls: LinearLayout
+    private lateinit var bottomControls: LinearLayout
+
+    private var playbackPosition = 0L
+    private var playWhenReady = true
+    private var isFullScreen = false
+    private var isLocked = false
 
-    @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        restorePlayerState(savedInstanceState)
+        configureEdgeToEdgePlayer()
         setView()
-        preparePlayer()
-        setFindViewById()
-        setLockScreen()
-        setFullScreen()
+        bindControllerViews()
+        setupControls()
+        setupBackNavigation()
+        initializePlayer()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (player == null) initializePlayer()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (player == null) initializePlayer()
+        updateSystemBars()
+        player?.playWhenReady = playWhenReady
+    }
+
+    override fun onPause() {
+        savePlaybackState()
+        player?.pause()
+        super.onPause()
+    }
+
+    override fun onStop() {
+        savePlaybackState()
+        releasePlayer()
+        super.onStop()
+    }
+
+    override fun onDestroy() {
+        releasePlayer()
+        super.onDestroy()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        savePlaybackState()
+        outState.putLong(KEY_PLAYBACK_POSITION, playbackPosition)
+        outState.putBoolean(KEY_PLAY_WHEN_READY, playWhenReady)
+        outState.putBoolean(KEY_IS_FULLSCREEN, isFullScreen)
+        outState.putBoolean(KEY_IS_LOCKED, isLocked)
+        super.onSaveInstanceState(outState)
     }
 
     private fun setView() {
         binding = ActivityMainBinding.inflate(layoutInflater)
-        val view = binding.root
-        setContentView(view)
+        setContentView(binding.root)
     }
 
-    private fun setFindViewById() {
-        imageViewFullScreen = findViewById(R.id.imageViewFullScreen)
-        imageViewLock = findViewById(R.id.imageViewLock)
-        linearLayoutControlUp = findViewById(R.id.linearLayoutControlUp)
-        linearLayoutControlBottom = findViewById(R.id.linearLayoutControlBottom)
+    private fun configureEdgeToEdgePlayer() {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowCompat.getInsetsController(window, window.decorView).systemBarsBehavior =
+            WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
     }
 
-    private fun preparePlayer() {
-        exoPlayer = ExoPlayer.Builder(this).setSeekBackIncrementMs(INCREMENT_MILLIS)
-            .setSeekForwardIncrementMs(INCREMENT_MILLIS)
-            .build()
-        exoPlayer?.playWhenReady = true
-        binding.player.player = exoPlayer
-        val defaultHttpDataSourceFactory = DefaultHttpDataSource.Factory()
-        val mediaItem =
-            MediaItem.fromUri(URL)
-        val mediaSource =
-            HlsMediaSource.Factory(defaultHttpDataSourceFactory).createMediaSource(mediaItem)
-        exoPlayer?.apply {
-            setMediaSource(mediaSource)
-            seekTo(playbackPosition)
-            playWhenReady = playWhenReady
-            prepare()
-        }
+    private fun bindControllerViews() {
+        fullScreenButton = findViewById(R.id.imageViewFullScreen)
+        lockButton = findViewById(R.id.imageViewLock)
+        topControls = findViewById(R.id.linearLayoutControlUp)
+        bottomControls = findViewById(R.id.linearLayoutControlBottom)
     }
 
+    private fun setupControls() {
+        updateLockState()
+        updateFullScreenState()
 
-    private fun lockScreen(lock: Boolean) {
-        if (lock) {
-            linearLayoutControlUp.visibility = View.INVISIBLE
-            linearLayoutControlBottom.visibility = View.INVISIBLE
-        } else {
-            linearLayoutControlUp.visibility = View.VISIBLE
-            linearLayoutControlBottom.visibility = View.VISIBLE
+        lockButton.setOnClickListener {
+            isLocked = !isLocked
+            updateLockState()
+        }
+
+        fullScreenButton.setOnClickListener {
+            toggleFullScreen()
         }
     }
 
-    private fun setLockScreen() {
-        imageViewLock.setOnClickListener {
-            if (!isLock) {
-                imageViewLock.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        applicationContext,
-                        R.drawable.ic_baseline_lock
-                    )
-                )
-            } else {
-                imageViewLock.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        applicationContext,
-                        R.drawable.ic_baseline_lock_open
-                    )
-                )
+    private fun setupBackNavigation() {
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    when {
+                        isLocked -> Unit
+                        isFullScreen || resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE ->
+                            exitFullScreen()
+                        else -> {
+                            isEnabled = false
+                            onBackPressedDispatcher.onBackPressed()
+                        }
+                    }
+                }
             }
-            isLock = !isLock
-            lockScreen(isLock)
-        }
+        )
     }
 
-    @SuppressLint("SourceLockedOrientationActivity")
-    private fun setFullScreen() {
-        imageViewFullScreen.setOnClickListener {
-            if (!isFullScreen) {
-                imageViewFullScreen.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        applicationContext,
-                        R.drawable.ic_baseline_fullscreen_exit
-                    )
-                )
-                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-            } else {
-                imageViewFullScreen.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        applicationContext,
-                        R.drawable.ic_baseline_fullscreen
-                    )
-                )
-                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+    private fun restorePlayerState(savedInstanceState: Bundle?) {
+        savedInstanceState ?: return
+        playbackPosition = savedInstanceState.getLong(KEY_PLAYBACK_POSITION, 0L)
+        playWhenReady = savedInstanceState.getBoolean(KEY_PLAY_WHEN_READY, true)
+        isFullScreen = savedInstanceState.getBoolean(KEY_IS_FULLSCREEN, false)
+        isLocked = savedInstanceState.getBoolean(KEY_IS_LOCKED, false)
+    }
+
+    private fun initializePlayer() {
+        if (player != null) return
+
+        player = ExoPlayer.Builder(this)
+            .setSeekBackIncrementMs(SEEK_INCREMENT_MILLIS)
+            .setSeekForwardIncrementMs(SEEK_INCREMENT_MILLIS)
+            .build()
+            .also { exoPlayer ->
+                binding.player.player = exoPlayer
+                exoPlayer.setMediaItem(MediaItem.fromUri(STREAM_URL))
+                exoPlayer.seekTo(playbackPosition)
+                exoPlayer.playWhenReady = playWhenReady
+                exoPlayer.prepare()
             }
-            isFullScreen = !isFullScreen
+    }
+
+    private fun savePlaybackState() {
+        player?.let { exoPlayer ->
+            playbackPosition = exoPlayer.currentPosition.coerceAtLeast(0L)
+            playWhenReady = exoPlayer.playWhenReady
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
-        if (isLock) return
-        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            imageViewFullScreen.performClick()
-        } else super.onBackPressed()
+    private fun releasePlayer() {
+        savePlaybackState()
+        binding.player.player = null
+        player?.release()
+        player = null
     }
 
+    private fun updateLockState() {
+        val controlsVisibility = if (isLocked) View.INVISIBLE else View.VISIBLE
+        topControls.visibility = controlsVisibility
+        bottomControls.visibility = controlsVisibility
+        lockButton.setImageResource(
+            if (isLocked) R.drawable.ic_baseline_lock else R.drawable.ic_baseline_lock_open
+        )
+        lockButton.contentDescription = getString(
+            if (isLocked) R.string.unlock_controls else R.string.lock_controls
+        )
+    }
 
-    override fun onStop() {
-        super.onStop()
-        exoPlayer?.stop()
+    @SuppressLint("SourceLockedOrientationActivity")
+    private fun toggleFullScreen() {
+        if (isFullScreen) {
+            exitFullScreen()
+        } else {
+            isFullScreen = true
+            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            updateFullScreenState()
+        }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        exoPlayer?.release()
+    @SuppressLint("SourceLockedOrientationActivity")
+    private fun exitFullScreen() {
+        isFullScreen = false
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+        updateFullScreenState()
     }
 
-    override fun onPause() {
-        super.onPause()
-        exoPlayer?.pause()
+    private fun updateFullScreenState() {
+        fullScreenButton.setImageDrawable(
+            ContextCompat.getDrawable(
+                this,
+                if (isFullScreen) R.drawable.ic_baseline_fullscreen_exit else R.drawable.ic_baseline_fullscreen
+            )
+        )
+        fullScreenButton.contentDescription = getString(
+            if (isFullScreen) R.string.exit_full_screen else R.string.enter_full_screen
+        )
+        updateSystemBars()
+    }
+
+    private fun updateSystemBars() {
+        val controller = WindowCompat.getInsetsController(window, window.decorView)
+        if (isFullScreen || resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            controller.hide(WindowInsetsCompat.Type.systemBars())
+        } else {
+            controller.show(WindowInsetsCompat.Type.systemBars())
+        }
     }
 
     companion object {
-        private const val URL = "https://d1gnaphp93fop2.cloudfront.net/videos/multiresolution/rendition_new10.m3u8"
-        private var isFullScreen = false
-        private var isLock = false
-        private const val INCREMENT_MILLIS = 5000L
+        private const val STREAM_URL =
+            "https://d1gnaphp93fop2.cloudfront.net/videos/multiresolution/rendition_new10.m3u8"
+        private const val SEEK_INCREMENT_MILLIS = 5_000L
+        private const val KEY_PLAYBACK_POSITION = "playback_position"
+        private const val KEY_PLAY_WHEN_READY = "play_when_ready"
+        private const val KEY_IS_FULLSCREEN = "is_fullscreen"
+        private const val KEY_IS_LOCKED = "is_locked"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/drawable/bg_bottom_panel.xml b/app/src/main/res/drawable/bg_bottom_panel.xml
new file mode 100644
index 0000000..24b8c45
--- /dev/null
+++ b/app/src/main/res/drawable/bg_bottom_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/player_panel" />
+    <corners android:radius="24dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/player_panel_stroke" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_control_pill.xml b/app/src/main/res/drawable/bg_control_pill.xml
new file mode 100644
index 0000000..96b3a4d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_control_pill.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/player_panel" />
+    <corners android:radius="999dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/player_panel_stroke" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_player_overlay.xml b/app/src/main/res/drawable/bg_player_overlay.xml
new file mode 100644
index 0000000..15b6a61
--- /dev/null
+++ b/app/src/main/res/drawable/bg_player_overlay.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/player_overlay_center"
+        android:endColor="@color/player_overlay_edge"
+        android:startColor="@color/player_overlay_edge" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_primary_control.xml b/app/src/main/res/drawable/bg_primary_control.xml
new file mode 100644
index 0000000..080c864
--- /dev/null
+++ b/app/src/main/res/drawable/bg_primary_control.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/player_accent" />
+</shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4c111ab..747340d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/player_surface">
 
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
         android:id="@+id/player"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/background_dark"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/player_surface"
+        android:keepScreenOn="true"
         app:controller_layout_id="@layout/custom_controller"
-        app:player_layout_id="@layout/exo_player_view"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:resize_mode="fit"
+        app:show_buffering="when_playing"
+        app:show_shuffle_button="false"
         app:use_controller="true" />
-</RelativeLayout>
\ No newline at end of file
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/custom_controller.xml b/app/src/main/res/layout/custom_controller.xml
index 52a19d4..083d74f 100644
--- a/app/src/main/res/layout/custom_controller.xml
+++ b/app/src/main/res/layout/custom_controller.xml
@@ -1,103 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#80000000">
+    android:background="@drawable/bg_player_overlay"
+    android:paddingStart="20dp"
+    android:paddingTop="20dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="20dp">
 
     <ImageView
         android:id="@+id/imageViewLock"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:padding="10dp"
+        style="@style/PlayerControlButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@string/lock_controls"
         android:src="@drawable/ic_baseline_lock_open"
-        android:theme="@style/ClickableView" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <LinearLayout
         android:id="@+id/linearLayoutControlUp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@drawable/bg_control_pill"
+        android:gravity="center"
         android:orientation="horizontal"
-        android:layout_centerInParent="true">
-        <ImageView
-            android:id="@+id/exo_rew"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_replay"
-            android:layout_marginEnd="50dp"
-            android:theme="@style/ClickableView"
-            />
-        <ImageView
-            android:id="@+id/exo_play"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_play_arrow"
-            android:theme="@style/ClickableView"
-            />
+        android:paddingStart="14dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="14dp"
+        android:paddingBottom="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <ImageView
-            android:id="@+id/exo_pause"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_pause"
-            android:theme="@style/ClickableView"
-            />
+            android:id="@id/exo_rew"
+            style="@style/PlayerControlButton"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:contentDescription="@string/rewind"
+            android:src="@drawable/ic_baseline_replay" />
+
+        <FrameLayout
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
+
+            <ImageView
+                android:id="@id/exo_play"
+                style="@style/PlayerPrimaryControlButton"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/play"
+                android:src="@drawable/ic_baseline_play_arrow" />
+
+            <ImageView
+                android:id="@id/exo_pause"
+                style="@style/PlayerPrimaryControlButton"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/pause"
+                android:src="@drawable/ic_baseline_pause" />
+        </FrameLayout>
+
         <ImageView
-            android:id="@+id/exo_ffwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_forward"
-            android:layout_marginStart="50dp"
-            android:theme="@style/ClickableView"
-            />
+            android:id="@id/exo_ffwd"
+            style="@style/PlayerControlButton"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:contentDescription="@string/fast_forward"
+            android:src="@drawable/ic_baseline_forward" />
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/linearLayoutControlBottom"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="@drawable/bg_bottom_panel"
         android:orientation="vertical"
-        android:layout_alignParentBottom="true"
-        >
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="14dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="8dp"
-            android:gravity="center">
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <TextView
-                android:id="@+id/exo_position"
+                android:id="@id/exo_position"
+                style="@style/PlayerTimeText"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"/>
+                android:layout_height="wrap_content" />
+
             <TextView
+                style="@style/PlayerTimeTextMuted"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="/"
-                android:textColor="#CBCDC8"
-                android:layout_marginEnd="4dp"/>
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:text="@string/time_separator" />
+
             <TextView
-                android:id="@+id/exo_duration"
+                android:id="@id/exo_duration"
+                style="@style/PlayerTimeTextMuted"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="#CBCDC8"/>
+                android:layout_weight="1" />
+
             <ImageView
                 android:id="@+id/imageViewFullScreen"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:src="@drawable/exo_controls_fullscreen_enter"
-                android:theme="@style/ClickableView"
-                />
+                style="@style/PlayerControlButton"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:contentDescription="@string/enter_full_screen"
+                android:src="@drawable/ic_baseline_fullscreen" />
         </LinearLayout>
-        <com.google.android.exoplayer2.ui.DefaultTimeBar
-            android:id="@+id/exo_progress"
+
+        <androidx.media3.ui.DefaultTimeBar
+            android:id="@id/exo_progress"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-8dp"
-            app:unplayed_color="#45424E"
-            app:buffered_color="#95989F"
-            app:played_color="#FF00FF"
-            app:scrubber_color="#FF00FF"
-            />
+            android:layout_height="32dp"
+            android:layout_marginTop="8dp"
+            app:bar_height="4dp"
+            app:buffered_color="@color/player_buffered"
+            app:played_color="@color/player_accent"
+            app:scrubber_color="@color/player_accent"
+            app:scrubber_dragged_size="18dp"
+            app:scrubber_enabled_size="14dp"
+            app:unplayed_color="@color/player_unplayed" />
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 580ad18..06d37c8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,17 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.ExoPlayerScreenLock" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+<resources>
+    <style name="Theme.ExoPlayerScreenLock" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/player_accent</item>
+        <item name="colorPrimaryVariant">@color/player_surface</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorSecondary">@color/player_accent</item>
+        <item name="colorOnSecondary">@color/white</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:navigationBarColor">@color/player_surface</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..fff3871 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+
+    <color name="player_surface">#05070D</color>
+    <color name="player_accent">#FF3D71</color>
+    <color name="player_on_accent">#FFFFFFFF</color>
+    <color name="player_text_primary">#F7F8FA</color>
+    <color name="player_text_secondary">#B9C0CC</color>
+    <color name="player_panel">#B3121722</color>
+    <color name="player_panel_stroke">#26FFFFFF</color>
+    <color name="player_overlay_edge">#A6000000</color>
+    <color name="player_overlay_center">#33000000</color>
+    <color name="player_buffered">#8A9AA8B5</color>
+    <color name="player_unplayed">#595F6B78</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6f521d..33a465c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,12 @@
 <resources>
-    <string name="app_name">ExoPlayerScreenLock</string>
-</resources>
\ No newline at end of file
+    <string name="app_name">ExoPlayer Screen Lock</string>
+    <string name="enter_full_screen">Tam ekrana geç</string>
+    <string name="exit_full_screen">Tam ekrandan çık</string>
+    <string name="lock_controls">Kontrolleri kilitle</string>
+    <string name="unlock_controls">Kontrollerin kilidini aç</string>
+    <string name="play">Oynat</string>
+    <string name="pause">Duraklat</string>
+    <string name="rewind">5 saniye geri sar</string>
+    <string name="fast_forward">5 saniye ileri sar</string>
+    <string name="time_separator">/</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 96608e4..d5e6f0b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,30 @@
 <resources>
 
     <style name="ClickableView">
-        <item name="colorControlHighlight">@android:color/darker_gray</item>
+        <item name="colorControlHighlight">#33FFFFFF</item>
         <item name="android:background">?selectableItemBackgroundBorderless</item>
     </style>
-</resources>
\ No newline at end of file
+
+    <style name="PlayerControlButton" parent="ClickableView">
+        <item name="android:padding">10dp</item>
+        <item name="android:tint">@color/player_text_primary</item>
+    </style>
+
+    <style name="PlayerPrimaryControlButton" parent="ClickableView">
+        <item name="android:background">@drawable/bg_primary_control</item>
+        <item name="android:padding">16dp</item>
+        <item name="android:tint">@color/player_on_accent</item>
+    </style>
+
+    <style name="PlayerTimeText">
+        <item name="android:fontFamily">sans</item>
+        <item name="android:textColor">@color/player_text_primary</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="PlayerTimeTextMuted" parent="PlayerTimeText">
+        <item name="android:textColor">@color/player_text_secondary</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 203fa1b..06d37c8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,22 +1,17 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.ExoPlayerScreenLock" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+<resources>
+    <style name="Theme.ExoPlayerScreenLock" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/player_accent</item>
+        <item name="colorPrimaryVariant">@color/player_surface</item>
         <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-    <style name="Theme.AppCompat.Light.NoActionBar.FullScreen" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="colorSecondary">@color/player_accent</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="android:navigationBarColor">@color/player_surface</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/gradle.properties b/gradle.properties
index 022338b..cccbfe6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false