diff --git a/app/build.gradle b/app/build.gradle
index 0d333882..b0f62af9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 31
 
-        versionCode 36
-        versionName "2.4.4"
+        versionCode 37
+        versionName "2.4.5"
 
         resValue "string", "app_version",
                 "${defaultConfig.versionName}${versionNameSuffix ?: ""}"
@@ -159,4 +159,7 @@ dependencies {
 
     // debugImplementation because LeakCanary should only run in debug builds.
     // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+
+    // for shimmer when loading
+    implementation 'com.facebook.shimmer:shimmer:0.5.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 7680abe2..99884f36 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -47,7 +47,7 @@ class APIRepository(val api: MainAPI) {
         }
     }
 
-    suspend fun getMainPage(): Resource<HomePageResponse> {
+    suspend fun getMainPage(): Resource<HomePageResponse?> {
         return safeApiCall {
             api.getMainPage() ?: throw ErrorLoadingException()
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index f201d6c0..b7521193 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -248,26 +248,30 @@ class HomeFragment : Fragment() {
         observe(homeViewModel.page) { data ->
             when (data) {
                 is Resource.Success -> {
+                    home_loading_shimmer?.stopShimmer()
+
                     val d = data.value
 
                     currentHomePage = d
                     (home_master_recycler?.adapter as ParentItemAdapter?)?.items =
-                        d.items.mapNotNull {
+                        d?.items?.mapNotNull {
                             try {
                                 HomePageList(it.name, it.list.filterSearchResponse())
                             } catch (e: Exception) {
                                 logError(e)
                                 null
                             }
-                        }
+                        } ?: listOf()
 
                     home_master_recycler?.adapter?.notifyDataSetChanged()
 
-                    home_loading.visibility = View.GONE
-                    home_loading_error.visibility = View.GONE
-                    home_loaded.visibility = View.VISIBLE
+                    home_loading?.isVisible = false
+                    home_loading_error?.isVisible = false
+                    home_loaded?.isVisible = true
                 }
                 is Resource.Failure -> {
+                    home_loading_shimmer?.stopShimmer()
+
                     result_error_text.text = data.errorString
 
                     home_reload_connectionerror.setOnClickListener(apiChangeClickListener)
@@ -287,14 +291,15 @@ class HomeFragment : Fragment() {
                         }
                     }
 
-                    home_loading.visibility = View.GONE
-                    home_loading_error.visibility = View.VISIBLE
-                    home_loaded.visibility = View.GONE
+                    home_loading?.isVisible = false
+                    home_loading_error?.isVisible = true
+                    home_loaded?.isVisible = false
                 }
                 is Resource.Loading -> {
-                    home_loading.visibility = View.VISIBLE
-                    home_loading_error.visibility = View.GONE
-                    home_loaded.visibility = View.GONE
+                    home_loading_shimmer?.startShimmer()
+                    home_loading?.isVisible = true
+                    home_loading_error?.isVisible = false
+                    home_loaded?.isVisible = false
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index 10435b59..ff8a63db 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -37,8 +37,8 @@ class HomeViewModel : ViewModel() {
     private val _apiName = MutableLiveData<String>()
     val apiName: LiveData<String> = _apiName
 
-    private val _page = MutableLiveData<Resource<HomePageResponse>>()
-    val page: LiveData<Resource<HomePageResponse>> = _page
+    private val _page = MutableLiveData<Resource<HomePageResponse?>>()
+    val page: LiveData<Resource<HomePageResponse?>> = _page
 
     private val _randomItems = MutableLiveData<List<SearchResponse>?>(null)
     val randomItems: LiveData<List<SearchResponse>?> = _randomItems
@@ -154,7 +154,7 @@ class HomeViewModel : ViewModel() {
             when (data) {
                 is Resource.Success -> {
                     val home = data.value
-                    if (home.items.isNotEmpty()) {
+                    if (home?.items?.isNullOrEmpty() == false) {
                         val currentList =
                             home.items.shuffled().filter { !it.list.isNullOrEmpty() }.flatMap { it.list }
                                 .distinctBy { it.url }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index cea841c1..f6f9b876 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -357,7 +357,7 @@ class ResultFragment : Fragment() {
             var currentSubs: HashMap<String, SubtitleFile>? = null
 
             val showTitle =
-                episodeClick.data.name ?: getString(R.string.episode_name_format).format(
+                episodeClick.data.name ?: context?.getString(R.string.episode_name_format)?.format(
                     getString(R.string.episode),
                     episodeClick.data.episode
                 )
@@ -801,7 +801,7 @@ class ResultFragment : Fragment() {
                     WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
                     watchType.ordinal,
                     fab.context.getString(R.string.action_add_to_bookmarks),
-                    showApply = true,
+                    showApply = false,
                     {}) {
                     viewModel.updateWatchStatus(fab.context, WatchType.values()[it])
                 }
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index b29bfb33..1091177f 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -135,11 +135,38 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
+    <!--
     <ProgressBar
             android:visibility="visible"
             tools:visibility="gone"
             android:id="@+id/download_loading"
             android:layout_gravity="center"
             android:layout_width="50dp" android:layout_height="50dp">
-    </ProgressBar>
+    </ProgressBar>-->
+
+    <com.facebook.shimmer.ShimmerFrameLayout
+            android:id="@+id/download_loading"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_highlight_alpha="0.3"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_auto_start="true"
+            android:paddingTop="40dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:orientation="vertical">
+        <LinearLayout
+                android:layout_marginStart="@dimen/loading_margin"
+                android:layout_marginEnd="@dimen/loading_margin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+            <include layout="@layout/loading_downloads"/>
+            <include layout="@layout/loading_downloads"/>
+            <include layout="@layout/loading_downloads"/>
+            <include layout="@layout/loading_downloads"/>
+            <include layout="@layout/loading_downloads"/>
+            <include layout="@layout/loading_downloads"/>
+        </LinearLayout>
+    </com.facebook.shimmer.ShimmerFrameLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 030274d8..b524d4fc 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -11,17 +11,81 @@
 
     <FrameLayout
             android:visibility="gone"
-            tools:visibility="gone"
+            tools:visibility="visible"
             android:id="@+id/home_loading"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <ProgressBar
                 android:layout_gravity="center"
-                android:visibility="visible"
-                tools:visibility="visible"
+                android:visibility="gone"
+                tools:visibility="gone"
                 android:layout_width="50dp"
                 android:layout_height="50dp">
         </ProgressBar>
+        <com.facebook.shimmer.ShimmerFrameLayout
+                android:id="@+id/home_loading_shimmer"
+                app:shimmer_base_alpha="0.2"
+                app:shimmer_highlight_alpha="0.3"
+                app:shimmer_duration="@integer/loading_time"
+                app:shimmer_auto_start="true"
+                android:paddingTop="40dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginTop="15dp"
+                android:orientation="vertical">
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                <FrameLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    <androidx.cardview.widget.CardView
+                            android:layout_margin="@dimen/loading_margin"
+                            android:layout_gravity="center"
+                            app:cardCornerRadius="@dimen/loading_radius"
+                            android:background="@color/grayShimmer"
+                            android:translationX="-164dp"
+                            android:layout_width="125dp"
+                            android:layout_height="200dp">
+                    </androidx.cardview.widget.CardView>
+                    <androidx.cardview.widget.CardView
+                            android:layout_margin="@dimen/loading_margin"
+                            android:layout_gravity="center"
+                            app:cardCornerRadius="@dimen/loading_radius"
+                            android:background="@color/grayShimmer"
+                            android:layout_width="148dp"
+                            android:layout_height="234dp">
+                    </androidx.cardview.widget.CardView>
+                    <androidx.cardview.widget.CardView
+                            android:layout_margin="@dimen/loading_margin"
+                            android:layout_gravity="center"
+                            app:cardCornerRadius="@dimen/loading_radius"
+                            android:background="@color/grayShimmer"
+                            android:translationX="164dp"
+                            android:layout_width="125dp"
+                            android:layout_height="200dp">
+                    </androidx.cardview.widget.CardView>
+                </FrameLayout>
+                <include layout="@layout/loading_line_short_center"/>
+
+                <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_marginTop="@dimen/result_padding"
+                        android:layout_marginStart="@dimen/result_padding"
+                        android:layout_marginEnd="@dimen/result_padding"
+
+                        android:layout_width="match_parent" android:layout_height="wrap_content">
+
+                    <include layout="@layout/loading_list"/>
+                    <include layout="@layout/loading_list"/>
+                    <include layout="@layout/loading_list"/>
+                </LinearLayout>
+            </LinearLayout>
+        </com.facebook.shimmer.ShimmerFrameLayout>
+
         <FrameLayout
                 android:id="@+id/home_loading_statusbar"
                 android:layout_width="match_parent"
@@ -84,7 +148,7 @@
     </LinearLayout>
     <androidx.core.widget.NestedScrollView
             android:background="?attr/primaryBlackBackground"
-            tools:visibility="visible"
+            tools:visibility="gone"
             android:visibility="gone"
             android:id="@+id/home_loaded"
             android:layout_width="match_parent"
@@ -304,17 +368,19 @@
                     </ImageView>
                 </FrameLayout>
 
-                <androidx.recyclerview.widget.RecyclerView
-                        android:paddingHorizontal="5dp"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/home_watch_child_recyclerview"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:listitem="@layout/home_result_grid"
-                />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                            android:paddingHorizontal="5dp"
+                            android:clipToPadding="false"
+                            android:descendantFocusability="afterDescendants"
+                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                            android:id="@+id/home_watch_child_recyclerview"
+                            android:orientation="horizontal"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:listitem="@layout/home_result_grid"
+                    />
+
             </LinearLayout>
 
             <LinearLayout
@@ -404,7 +470,6 @@
                             android:contentDescription="@string/home_more_info">
                     </ImageView>
                 </FrameLayout>
-
                 <androidx.recyclerview.widget.RecyclerView
                         android:paddingHorizontal="5dp"
                         android:clipToPadding="false"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 45418391..9e4bf49d 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -10,13 +10,59 @@
         android:focusable="true"
 >
 
-    <ProgressBar
+    <com.facebook.shimmer.ShimmerFrameLayout
+            tools:visibility="gone"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_highlight_alpha="0.3"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_auto_start="true"
+            android:paddingTop="40dp"
+            android:id="@+id/result_loading"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_margin="@dimen/result_padding"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+            <LinearLayout
+                    android:layout_marginBottom="@dimen/loading_margin"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                <include layout="@layout/loading_poster"/>
+                <LinearLayout
+                        android:layout_marginStart="@dimen/loading_margin"
+                        android:layout_marginEnd="@dimen/loading_margin"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+                    <include layout="@layout/loading_line"/>
+                    <include layout="@layout/loading_line"/>
+                    <include layout="@layout/loading_line"/>
+                    <include layout="@layout/loading_line"/>
+                    <include layout="@layout/loading_line_short"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <ImageView android:layout_width="match_parent" android:layout_height="20dp"
+                       tools:ignore="ContentDescription"/>
+            <include layout="@layout/loading_episode"/>
+            <include layout="@layout/loading_episode"/>
+            <include layout="@layout/loading_episode"/>
+        </LinearLayout>
+    </com.facebook.shimmer.ShimmerFrameLayout>
+    <!--<ProgressBar
             android:visibility="visible"
             tools:visibility="gone"
             android:id="@+id/result_loading"
             android:layout_gravity="center"
             android:layout_width="50dp" android:layout_height="50dp">
-    </ProgressBar>
+    </ProgressBar>-->
     <LinearLayout
             android:id="@+id/result_loading_error"
 
@@ -201,9 +247,10 @@
                     </LinearLayout>
                 </FrameLayout>
                 <LinearLayout
+                        android:clipToPadding="false"
                         android:orientation="vertical"
-                        android:layout_marginStart="@dimen/result_padding"
-                        android:layout_marginEnd="@dimen/result_padding"
+                        android:paddingStart="@dimen/result_padding"
+                        android:paddingEnd="@dimen/result_padding"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent">
                     <LinearLayout
@@ -550,9 +597,8 @@
                     </androidx.core.widget.ContentLoadingProgressBar>
                     <androidx.recyclerview.widget.RecyclerView
                             android:descendantFocusability="afterDescendants"
-
                             android:id="@+id/result_episodes"
-
+                            android:clipToPadding="false"
                             android:layout_marginTop="0dp"
                             android:paddingBottom="100dp"
                             tools:listitem="@layout/result_episode"
@@ -565,7 +611,28 @@
         <LinearLayout
                 android:layout_gravity="bottom"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+        >
+            <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+                    android:visibility="gone"
+                    tools:visibility="visible"
+                    app:elevation="0dp"
+                    android:textStyle="bold"
+                    app:backgroundTint="?attr/primaryGrayBackground"
+                    app:tint="?attr/colorPrimary"
+                    android:textColor="?attr/colorPrimary"
+                    app:iconTint="?attr/colorPrimary"
+                    android:layout_margin="16dp"
+                    android:id="@+id/result_bookmark_fab"
+                    android:layout_gravity="end|bottom"
+                    app:icon="@drawable/ic_baseline_bookmark_24"
+                    android:textAllCaps="false"
+                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:ignore="ContentDescription">
+            </com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton>
             <fragment
                     app:customCastBackgroundColor="?attr/primaryBlackBackground"
                     app:castControlButtons="@array/cast_mini_controller_control_buttons"
@@ -598,21 +665,5 @@
                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/search_poster_descript"/>
     </androidx.cardview.widget.CardView>-->
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:elevation="0dp"
-            android:textStyle="bold"
-            app:backgroundTint="?attr/primaryGrayBackground"
-            app:tint="?attr/colorPrimary"
-            android:textColor="?attr/colorPrimary"
-            app:iconTint="?attr/colorPrimary"
-            android:layout_margin="16dp"
-            android:id="@+id/result_bookmark_fab"
-            android:layout_gravity="end|bottom"
-            app:icon="@drawable/ic_baseline_bookmark_24"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:ignore="ContentDescription">
-    </com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading_downloads.xml b/app/src/main/res/layout/loading_downloads.xml
new file mode 100644
index 00000000..bcd8df89
--- /dev/null
+++ b/app/src/main/res/layout/loading_downloads.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        android:paddingBottom="@dimen/loading_margin"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <include layout="@layout/loading_poster"/>
+
+    <LinearLayout
+            android:layout_marginStart="15dp"
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="50dp"
+            android:layout_height="wrap_content">
+        <include layout="@layout/loading_line"/>
+        <include layout="@layout/loading_line_short"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/loading_episode.xml b/app/src/main/res/layout/loading_episode.xml
new file mode 100644
index 00000000..062c3975
--- /dev/null
+++ b/app/src/main/res/layout/loading_episode.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        android:paddingTop="@dimen/loading_margin"
+        android:paddingBottom="@dimen/loading_margin"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+        <LinearLayout
+                android:layout_marginBottom="@dimen/loading_margin"
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_height="wrap_content">
+            <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
+            <androidx.cardview.widget.CardView
+                    android:background="@color/grayShimmer"
+                    app:cardCornerRadius="@dimen/loading_radius"
+                    android:layout_width="126dp"
+                    android:layout_height="72dp"
+                    android:foreground="@drawable/outline_drawable"
+            >
+            </androidx.cardview.widget.CardView>
+            <LinearLayout
+                    android:layout_marginStart="15dp"
+                    android:orientation="vertical"
+                    android:layout_gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_marginEnd="50dp"
+                    android:layout_height="wrap_content">
+                <include layout="@layout/loading_line"/>
+                <include layout="@layout/loading_line_short"/>
+            </LinearLayout>
+        </LinearLayout>
+    <include layout="@layout/loading_line"/>
+    <include layout="@layout/loading_line"/>
+    </LinearLayout>
diff --git a/app/src/main/res/layout/loading_line.xml b/app/src/main/res/layout/loading_line.xml
new file mode 100644
index 00000000..9d43b4e6
--- /dev/null
+++ b/app/src/main/res/layout/loading_line.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+        app:cardCornerRadius="@dimen/loading_radius"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/loading_line_height"
+        android:layout_marginBottom="@dimen/loading_margin"
+        android:background="@color/grayShimmer"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="ContentDescription"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading_line_short.xml b/app/src/main/res/layout/loading_line_short.xml
new file mode 100644
index 00000000..620cf84f
--- /dev/null
+++ b/app/src/main/res/layout/loading_line_short.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+        app:cardCornerRadius="@dimen/loading_radius"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="120dp"
+        android:layout_height="@dimen/loading_line_height"
+        android:layout_marginBottom="@dimen/loading_margin"
+        android:background="@color/grayShimmer"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="ContentDescription"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading_line_short_center.xml b/app/src/main/res/layout/loading_line_short_center.xml
new file mode 100644
index 00000000..49340ab9
--- /dev/null
+++ b/app/src/main/res/layout/loading_line_short_center.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+        app:cardCornerRadius="@dimen/loading_radius"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="200dp"
+        android:layout_gravity="center"
+        android:layout_height="@dimen/loading_line_height"
+        android:layout_marginBottom="@dimen/loading_margin"
+        android:background="@color/grayShimmer"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="ContentDescription"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading_list.xml b/app/src/main/res/layout/loading_list.xml
new file mode 100644
index 00000000..29478930
--- /dev/null
+++ b/app/src/main/res/layout/loading_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        android:orientation="vertical"
+        android:paddingTop="@dimen/loading_margin"
+        android:paddingBottom="@dimen/loading_margin"
+        xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="200dp" android:layout_width="match_parent">
+    <include layout="@layout/loading_line_short"/>
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            xmlns:app="http://schemas.android.com/apk/res-auto">
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="match_parent" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+        <View android:layout_height="wrap_content" android:layout_width="@dimen/loading_margin"/>
+        <include layout="@layout/loading_poster"/>
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/loading_poster.xml b/app/src/main/res/layout/loading_poster.xml
new file mode 100644
index 00000000..1248eddc
--- /dev/null
+++ b/app/src/main/res/layout/loading_poster.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+        app:cardCornerRadius="@dimen/loading_radius"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="100dp"
+        android:layout_height="140dp"
+        android:background="@color/grayShimmer"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        tools:ignore="ContentDescription"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings-pt.xml b/app/src/main/res/values-pt/strings-pt.xml
index f1fb3aab..f7b8ffcf 100644
--- a/app/src/main/res/values-pt/strings-pt.xml
+++ b/app/src/main/res/values-pt/strings-pt.xml
@@ -1,188 +1,296 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 <!--Created by The Translator <https://play.google.com/store/apps/details?id=com.sunilpaulmathew.translator>-->
 
+	<!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-     <string name="search_poster_img_des">@string/result_poster_img_des</string>
-     <string name="episode_poster_img_des">Episode Poster</string>
-     <string name="home_main_poster_img_des">Main Poster</string>
-     <string name="home_next_random_img_des">Next Random</string>
-     <string name="go_back_img_des">Go back</string>
-     <string name="home_change_provider_img_des">Change Provider</string>
-     <string name="preview_background_img_des">Preview Background</string>
-     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
-     <string name="rated_format" formatted="true">Classificado: %.1f</string>
-     <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -> %s</string>
-     <string name="filler_format" formatted="true">(Cheio) %s</string>
-     <string name="app_name">CloudStream</string>
-     <string name="title_home">Início</string>
-     <string name="title_search">Buscar</string>
-     <string name="title_downloads">Downloads</string>
-     <string name="title_settings">Opções</string>
-     <string name="search_hint">Buscar…</string>
-     <string name="no_data">Sem dados</string>
-     <string name="episode_more_options_des">Mais Opções</string>
-     <string name="next_episode">Próximo episódio</string>
-     <string name="result_tags">Gêneros</string>
-     <string name="result_share">Compartir</string>
-     <string name="result_open_in_browser">Abrir no Navegador</string>
-     <string name="skip_loading">Saltar Carga</string>
-     <string name="loading_chromecast">Cargando…</string>
-     <string name="type_watching">Assistindo</string>
-     <string name="type_on_hold">Em espera</string>
-     <string name="type_completed">Completado</string>
-     <string name="type_dropped">Deixado</string>
-     <string name="type_plan_to_watch">Planejando assistir</string>
-     <string name="type_none">Nenhuma</string>
-     <string name="play_movie_button">Assistir Filme</string>
-     <string name="play_torrent_button">Stream Torrent</string>
-     <string name="pick_source">Origems</string>
-     <string name="pick_subtitle">Subtítulos</string>
-     <string name="reload_error">Reintentar conexão…</string>
-     <string name="result_go_back">Voltar atrás</string>
-     <string name="play_episode">Reproduzir episódio</string>
-     <string name="download">Descàrregar</string>
-     <string name="downloaded">Descàrregado</string>
-     <string name="downloading">Descàrregando</string>
-     <string name="download_paused">Descàrrega Pausada</string>
-     <string name="download_started">Descàrrega Iniciada</string>
-     <string name="download_failed">Descàrrega Fallida</string>
-     <string name="download_canceled">Descàrrega Cancelada</string>
-     <string name="download_done">Descàrrega Terminada</string>
-     <string name="error_loading_links_toast">Error Cargando Links</string>
-     <string name="download_storage_text">Armazenagem Interno</string>
-     <string name="app_dubbed_text">Dub</string>
-     <string name="app_subbed_text">Sub</string>
-     <string name="popup_delete_file">Eliminar Arquivo</string>
-     <string name="popup_play_file">Reproduzir Arquivo</string>
-     <string name="popup_resume_download">Retomar Descàrrega</string>
-     <string name="popup_pause_download">Pausar Descàrrega</string>
-     <string name="pref_disable_acra">Desativar o relatório automático de erros</string>
-     <string name="home_more_info">Mais info</string>
-     <string name="home_expanded_hide">Esconder</string>
-     <string name="home_play">Reproduzir</string>
-     <string name="home_info">Info</string>
-     <string name="filter_bookmarks">Filtrar Marcadores</string>
-     <string name="error_bookmarks_text">Marcadores</string>
-     <string name="action_remove_from_bookmarks">Eliminar</string>
-     <string name="sort_apply">Aplicar</string>
-     <string name="sort_cancel">Cancelar</string>
-     <string name="player_speed">Velocidade do Reproductor</string>
-     <string name="subtitles_settings">Ajustes de Subtítulos</string>
-     <string name="subs_text_color">Color do Texto</string>
-     <string name="subs_outline_color">Color do Delineado</string>
-     <string name="subs_background_color">Color do Fondo</string>
-     <string name="subs_window_color">Color da Janela</string>
-     <string name="subs_edge_type">Tipo de Borda</string>
-     <string name="subs_subtitle_elevation">Elevação de Subtítulo</string>
-     <string name="subs_font">Fonte</string>
-     <string name="subs_font_size">Tamanho da Fonte</string>
-     <string name="search_provider_text_providers">Busca usando fornecedores</string>
-     <string name="search_provider_text_types">Busca usando tipos</string>
-     <string name="benene_count_text">%d Benenes dadas a os devs</string>
-     <string name="benene_count_text_none">Nenhum Benene dado</string>
-     <string name="subs_auto_select_language">Auto-seleção de Idioma</string>
-     <string name="subs_download_languages">Descàrregar Idiomas</string>
-     <string name="subs_hold_to_reset_to_default">Segure para reinicializar para o padrão</string>
-     <string name="continue_watching">Continuar Assistindo</string>
-     <string name="action_remove_watching">Eliminar</string>
-     <string name="action_open_watching">Mais Info</string>
-     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para que este provedor funcione corretamente</string>
-     <string name="vpn_torrent">Este provedor é uma torrent; uma VPN é recomendada</string>
-     <string name="torrent_plot">Descripção</string>
-     <string name="normal_no_plot">Nenhuma Trama Encontrada</string>
-     <string name="torrent_no_plot">Nenhuma Descripção Encontrada</string>
-     <string name="picture_in_picture">Picture-in-picture</string>
-     <string name="picture_in_picture_des">Continua a reprodução em um player em miniatura em cima de outros apps</string>
-     <string name="player_size_settings">Botão de redimensionamento do player</string>
-     <string name="player_size_settings_des">Tirar as bordas negras</string>
-     <string name="player_subtitles_settings">Subtítulos</string>
-     <string name="player_subtitles_settings_des">Configurações de subtítulos do Player</string>
-     <string name="eigengraumode_settings">Modo Eigengravy</string>
-     <string name="eigengraumode_settings_des">Adiciona um botão de velocidade no player</string>
-     <string name="swipe_to_seek_settings">Deslize para buscar para frente</string>
-     <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
-     <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
-     <string name="swipe_to_change_settings_des">Deslize para o lado esq. ou dir. para ajustar brilho ou volume</string>
-     <string name="double_tap_to_seek_settings">Duplo toque para buscar para frente</string>
-     <string name="use_system_brightness_settings">Usar o brilho da sistema</string>
-     <string name="use_system_brightness_settings_des">Usar o brilho da sistema em vez de uma sobreposição escura</string>
-     <string name="search">Buscar</string>
-     <string name="settings_info">Info</string>
-     <string name="advanced_search">Búsqueda Avançada</string>
-     <string name="advanced_search_des">Mostra resultados da busca separados por fornecedor</string>
-     <string name="bug_report_settings_off">Só envia dados sobre travamentos</string>
-     <string name="bug_report_settings_on">Não envia nenhum dado</string>
-     <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
-     <string name="updates_settings">Mostrar actualizações do app</string>
-     <string name="updates_settings_des">Busca novas actualizações à iniciar</string>
-     <string name="uprereleases_settings">Actualizar à Pré-lançamentos</string>
-     <string name="uprereleases_settings_des">Busca actualizações pré-lançamento em vez de só lançamentos completos</string>
-     <string name="github">Github</string>
-     <string name="lightnovel">App light novel por os mesmos devs</string>
-     <string name="discord">Junte-se à Discord</string>
-     <string name="benene">Dar um benene à os devs</string>
-     <string name="benene_des">Benene dada</string>
-     <string name="app_language">Linguagem do App</string>
-     <string name="no_chomecast_support_toast">Este fornecedor não tem suporte para Chromecast</string>
-     <string name="no_links_found_toast">Links Não Encontrados</string>
-     <string name="copy_link_toast">Link copiado para a prancheta</string>
-     <string name="play_episode_toast">Reproduzir episódio</string>
-     <string name="subs_default_reset_toast">Reinicializar para o padrão</string>
-     <string name="season">Temporada</string>
-     <string name="no_season">Sem Temporada</string>
-     <string name="episode">Episódio</string>
-     <string name="episodes">Episódios</string>
-     <string name="season_short">T</string>
-     <string name="episode_short">E</string>
-     <string name="delete_file">Eliminar Arquivo</string>
-     <string name="delete">Eliminar</string>
-     <string name="pause">Pausar</string>
-     <string name="resume">Retomar</string>
-     <string name="delete_message">Isto apagarà %s permanentemente\nVocê tem certeza?</string>
-     <string name="status_ongoing">Em Curso</string>
-     <string name="status_completed">Concluído</string>
-     <string name="status">Estado</string>
-     <string name="year">Ano</string>
-     <string name="rating">Classificação</string>
-     <string name="duration">Duração</string>
-     <string name="site">Sitio</string>
-     <string name="synopsis">Sinopsis</string>
-     <string name="queued">Em fila</string>
-     <string name="no_subtitles">Não Há Subtítulos</string>
-     <string name="default_subtitles">Por Padrão</string>
-     <string name="free_storage">Livre</string>
-     <string name="used_storage">Usado</string>
-     <string name="app_storage">App</string>
-     <string name="movies">Filmes</string>
-     <string name="tv_series">Séries de TV</string>
-     <string name="cartoons">Desenhos animados</string>
-     <string name="anime">Anime</string>
-     <string name="torrent">Torrent</string>
-     <string name="source_error">Erro de origem</string>
-     <string name="remote_error">Erro remoto</string>
-     <string name="render_error">Erro de Renderizador</string>
-     <string name="unexpected_error">Erro inesperado do player reproductor</string>
-     <string name="storage_error">Erro de descàrrega; verifica permissões de armazenamento</string>
-     <string name="episode_action_chomecast_episode">Chromecast o Episódio</string>
-     <string name="episode_action_chomecast_mirror">Chromecast á o Espelho</string>
-     <string name="episode_action_play_in_app">Assistir no App</string>
-     <string name="episode_action_play_in_vlc">Assistir no VLC</string>
-     <string name="episode_action_play_in_browser">Assistir no Navegador</string>
-     <string name="episode_action_copy_link">Copiar Link</string>
-     <string name="episode_action_auto_download">Auto Descàrrega</string>
-     <string name="episode_action_download_mirror">Descàrregar Espelho</string>
-     <string name="episode_action_reload_links">Recarregar Links</string>
-     <string name="no_update_found">Nenhuma Atualização</string>
-     <string name="check_for_update">Buscar Atualização</string>
-     <string name="video_lock">Fixar</string>
-     <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
-     <string name="video_source">Origem</string>
-     <string name="video_skip_op">Pular OP</string>
-     <string name="dont_show_again">Não mostra de novo</string>
-     <string name="update">Atualizar</string>
-     <string name="watch_quality_pref">Calidade Preferida</string>
-     <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Subtítulado</string>
-     <string name="resize_fit">Ajustar para a Tela</string>
-     <string name="resize_fill">Esticar</string>
-     <string name="resize_zoom">Aumentar</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Episode Poster</string>
+    <string name="home_main_poster_img_des">Main Poster</string>
+    <string name="home_next_random_img_des">Next Random</string>
+    <string name="go_back_img_des">Go back</string>
+    <string name="home_change_provider_img_des">Change Provider</string>
+    <string name="preview_background_img_des">Preview Background</string>
+	
+	 <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+    <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
+    <string name="rated_format" formatted="true">Classificado: %.1f</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada!\n%s -> %s</string>
+    <string name="filler_format" formatted="true">(Cheio) %s</string>
+	
+    <string name="app_name">CloudStream</string>
+    <string name="title_home">Início</string>
+    <string name="title_search">Buscar</string>
+    <string name="title_downloads">Downloads</string>
+    <string name="title_settings">Opções</string>
+	
+    <string name="search_hint">Buscar…</string>
+    <string name="no_data">Sem dados</string>
+    <string name="episode_more_options_des">Mais Opções</string>
+    <string name="next_episode">Próximo episódio</string>
+    <string name="result_tags">Gêneros</string>
+    <string name="result_share">Compartir</string>
+    <string name="result_open_in_browser">Abrir no Navegador</string>
+    <string name="skip_loading">Saltar Carga</string>
+    <string name="loading_chromecast">Cargando…</string>
+	
+    <string name="type_watching">Assistindo</string>
+    <string name="type_on_hold">Em espera</string>
+    <string name="type_completed">Completado</string>
+    <string name="type_dropped">Deixado</string>
+    <string name="type_plan_to_watch">Planejando assistir</string>
+	<string name="type_none">Nenhuma</string>
+	<string name="type_re_watching">Assistindo de Novo</string>
+	
+    <string name="play_movie_button">Assistir Filme</string>
+    <string name="play_torrent_button">Stream Torrent</string>
+    <string name="pick_source">Origems</string>
+    <string name="pick_subtitle">Subtítulos</string>
+    <string name="reload_error">Reintentar conexão…</string>
+    <string name="result_go_back">Voltar Atrás</string>
+    <string name="play_episode">Assistir Episódio</string>
+	
+    <string name="download">Descàrregar</string>
+    <string name="downloaded">Descàrregado</string>
+    <string name="downloading">Descàrregando</string>
+    <string name="download_paused">Descàrrega Pausada</string>
+    <string name="download_started">Descàrrega Iniciada</string>
+    <string name="download_failed">Descàrrega Fallida</string>
+    <string name="download_canceled">Descàrrega Cancelada</string>
+    <string name="download_done">Descàrrega Terminada</string>
+	
+    <string name="error_loading_links_toast">Error Cargando Links</string>
+    <string name="download_storage_text">Armazenagem Interno</string>
+	
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+	
+    <string name="popup_delete_file">Eliminar Arquivo</string>
+    <string name="popup_play_file">Reproduzir Arquivo</string>
+    <string name="popup_resume_download">Retomar Descàrrega</string>
+    <string name="popup_pause_download">Pausar Descàrrega</string>
+	
+    <string name="pref_disable_acra">Desativar o relatório automático de erros</string>
+    <string name="home_more_info">Mais info</string>
+    <string name="home_expanded_hide">Esconder</string>
+    <string name="home_play">Reproduzir</string>
+    <string name="home_info">Info</string>
+    <string name="filter_bookmarks">Filtrar Marcadores</string>
+    <string name="error_bookmarks_text">Marcadores</string>
+    <string name="action_remove_from_bookmarks">Eliminar</string>
+    <string name="sort_apply">Aplicar</string>
+    <string name="sort_cancel">Cancelar</string>
+    <string name="player_speed">Velocidade do Reproductor</string>
+	
+    <string name="subtitles_settings">Ajustes de Subtítulos</string>
+    <string name="subs_text_color">Color do Texto</string>
+    <string name="subs_outline_color">Color do Delineado</string>
+    <string name="subs_background_color">Color do Fondo</string>
+    <string name="subs_window_color">Color da Janela</string>
+    <string name="subs_edge_type">Tipo de Borda</string>
+    <string name="subs_subtitle_elevation">Elevação de Subtítulo</string>
+    <string name="subs_font">Fonte</string>
+    <string name="subs_font_size">Tamanho da Fonte</string>
+	
+    <string name="search_provider_text_providers">Busca usando fornecedores</string>
+    <string name="search_provider_text_types">Busca usando tipos</string>
+	
+    <string name="benene_count_text">%d Benenes dadas a os devs</string>
+    <string name="benene_count_text_none">Nenhum Benene dado</string>
+	
+    <string name="subs_auto_select_language">Auto-seleção de Idioma</string>
+    <string name="subs_download_languages">Descàrregar Idiomas</string>
+    <string name="subs_hold_to_reset_to_default">Segure para reinicializar para o padrão</string>
+    <string name="continue_watching">Continuar Assistindo</string>
+	
+    <string name="action_remove_watching">Eliminar</string>
+    <string name="action_open_watching">Mais info</string>
+	
+    <string name="vpn_might_be_needed">Uma VPN pode ser necessária para que este provedor funcione corretamente</string>
+    <string name="vpn_torrent">Este provedor é uma torrent; uma VPN é recomendada</string>
+    
+	<string name="provider_info_meta">Metadados não são fornecidos pelo site, o carregamento de vídeo pode falhar.</string>
+	
+	<string name="torrent_plot">Descripção</string>
+    <string name="normal_no_plot">Nenhuma Trama Encontrada</string>
+    <string name="torrent_no_plot">Nenhuma Descripção Encontrada</string>
+	
+    <string name="picture_in_picture">Picture-em-picture</string>
+    <string name="picture_in_picture_des">Continua a reprodução em um player em miniatura em cima de outros apps</string>
+    <string name="player_size_settings">Botão de redimensionamento do player</string>
+    <string name="player_size_settings_des">Tirar as bordas negras</string>
+    <string name="player_subtitles_settings">Subtítulos</string>
+    <string name="player_subtitles_settings_des">Configurações de subtítulos do Player</string>
+    <string name="eigengraumode_settings">Modo Eigengravy</string>
+    <string name="eigengraumode_settings_des">Adiciona um botão de velocidade no player</string>
+    <string name="swipe_to_seek_settings">Deslize para buscar para frente</string>
+    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
+    <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
+    <string name="swipe_to_change_settings_des">Deslize para o lado esq. ou dir. para ajustar brilho ou volume</string>
+    <string name="double_tap_to_seek_settings">Duplo toque para buscar para frente</string>
+    <string name="use_system_brightness_settings">Usar o brilho da sistema</string>
+    <string name="use_system_brightness_settings_des">Usar o brilho da sistema em vez de uma sobreposição escura</string>
+	
+    <string name="search">Buscar</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Búsqueda Avançada</string>
+    <string name="advanced_search_des">Mostra resultados da busca separados por fornecedor</string>
+    <string name="bug_report_settings_off">Só envia dados sobre travamentos</string>
+    <string name="bug_report_settings_on">Não envia nenhum dado</string>
+    <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
+    <string name="updates_settings">Mostrar actualizações do app</string>
+    <string name="updates_settings_des">Busca novas actualizações à iniciar</string>
+    <string name="uprereleases_settings">Actualizar à Pré-lançamentos</string>
+    <string name="uprereleases_settings_des">Busca actualizações pré-lançamento em vez de só lançamentos completos</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">App light novel por os mesmos devs</string>
+    <string name="discord">Junte-se à Discord</string>
+    <string name="benene">Dar um benene à os devs</string>
+    <string name="benene_des">Benene dada</string>
+	
+    <string name="app_language">Linguagem do App</string>
+	
+    <string name="no_chomecast_support_toast">Este fornecedor não tem suporte para Chromecast</string>
+    <string name="no_links_found_toast">Links Não Encontrados</string>
+    <string name="copy_link_toast">Link copiado para a prancheta</string>
+    <string name="play_episode_toast">Reproduzir episódio</string>
+    <string name="subs_default_reset_toast">Reinicializar para o padrão</string>
+	<string name="acra_report_toast">Desculpe, a aplicação falhou. Um relatório de erro anônimo será enviado para os
+       desenvolvedores
+    </string>
+	
+    <string name="season">Temporada</string>
+    <string name="no_season">Sem Temporada</string>
+    <string name="episode">Episódio</string>
+    <string name="episodes">Episódios</string>
+    <string name="season_short">T</string>
+    <string name="episode_short">E</string>
+	
+    <string name="delete_file">Eliminar Arquivo</string>
+    <string name="delete">Eliminar</string>
+    <string name="pause">Pausar</string>
+    <string name="resume">Retomar</string>
+    <string name="delete_message">Isto apagarà %s permanentemente\nVocê tem certeza?</string>
+	
+    <string name="status_ongoing">Em Curso</string>
+    <string name="status_completed">Concluído</string>
+    <string name="status">Estado</string>
+    <string name="year">Ano</string>
+    <string name="rating">Classificação</string>
+    <string name="duration">Duração</string>
+    <string name="site">Sitio</string>
+    <string name="synopsis">Sinopsis</string>
+	
+    <string name="queued">Em fila</string>
+    <string name="no_subtitles">Não Há Subtítulos</string>
+    <string name="default_subtitles">Por Padrão</string>
+	
+    <string name="free_storage">Livre</string>
+    <string name="used_storage">Usado</string>
+    <string name="app_storage">App</string>
+	
+	<!--plural-->
+    <string name="movies">Filmes</string>
+    <string name="tv_series">Séries de TV</string>
+    <string name="cartoons">Desenhos animados</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrentes</string>
+	<string name="documentaries">Documentários</string>
+	
+	<!--singular-->
+	<string name="movies_singular">Filme</string>
+	<string name="tv_series_singular">Sériado</string>
+	<string name="cartoons_singular">Desenho animado</string>
+	<string name="torrent_singular">Torrent</string>
+	<string name="documentaries_singular">Documentário</string>
+	
+    <string name="source_error">Erro de origem</string>
+    <string name="remote_error">Erro remoto</string>
+    <string name="render_error">Erro de Renderizador</string>
+    <string name="unexpected_error">Erro inesperado do player reproductor</string>
+    <string name="storage_error">Erro de descàrrega; verifica permissões de armazenamento</string>
+	
+    <string name="episode_action_chomecast_episode">Chromecast o Episódio</string>
+    <string name="episode_action_chomecast_mirror">Chromecast á o Espelho</string>
+    <string name="episode_action_play_in_app">Assistir no App</string>
+    <string name="episode_action_play_in_vlc">Assistir no VLC</string>
+    <string name="episode_action_play_in_browser">Assistir no Navegador</string>
+    <string name="episode_action_copy_link">Copiar Link</string>
+    <string name="episode_action_auto_download">Auto Descàrrega</string>
+    <string name="episode_action_download_mirror">Descàrregar Espelho</string>
+    <string name="episode_action_reload_links">Recarregar Links</string>
+	
+    <string name="no_update_found">Nenhuma Atualização</string>
+    <string name="check_for_update">Buscar Atualização</string>
+	
+    <string name="video_lock">Fixar</string>
+    <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
+    <string name="video_source">Origem</string>
+    <string name="video_skip_op">Pular OP</string>
+	
+    <string name="dont_show_again">Não mostra de novo</string>
+    <string name="update">Atualizar</string>
+    <string name="watch_quality_pref">Calidade Preferida</string>
+    <string name="dns_pref">DNS sobre HTTPS</string>
+    <string name="dns_pref_summary">Útil para contornar blocos do provedor de internet</string>	
+
+	<string name="download_path_pref">Caminho de descarga</string>	
+	
+    <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Subtítulado</string>
+	
+    <string name="resize_fit">Ajustar para a Tela</string>
+    <string name="resize_fill">Esticar</string>
+    <string name="resize_zoom">Aumentar</string>
+	
+	<string name="legal_notice">Aviso Legal</string>
+    <string name="legal_notice_text" translatable="false">Quaisquer questões legais relativas ao conteúdo desta aplicação
+       devem ser levados em conta com os próprios anfitriões e fornecedores de arquivos, pois não somos afiliados a eles.
+
+       Em caso de violação de direitos autorais, favor contatar diretamente as partes responsáveis ou os sites de streaming.
+
+       O aplicativo é puramente para uso educacional e pessoal.
+
+       O CloudStream 3 não hospeda nenhum conteúdo no aplicativo, e não tem controle sobre qual mídia é colocada ou retirada.
+       O CloudStream 3 funciona como qualquer outro mecanismo de busca, como o Google. O CloudStream 3 não hospeda, não faz upload ou
+       gerenciar qualquer vídeo, filme ou conteúdo. Ele simplesmente rasteja, agrega e exibe links em um conveniente,
+       interface amigável para o usuário.
+
+       Ela apenas raspa sites de terceiros que podem ser acessados publicamente através de qualquer navegador web normal. É o
+       responsabilidade do usuário de evitar qualquer ação que possa violar as leis que regem sua localidade. Utilizar
+       CloudStream 3 por sua própria conta e risco.
+    </string>
+	<string name="general">Geral</string>
+    <string name="provider_lang_settings">Idiomas dos Origems</string>
+    <string name="app_layout">Layout do App</string>
+    <string name="preferred_media_settings">Mídia preferida</string>
+
+    <string name="automatic">Auto</string>
+    <string name="tv_layout">Layout de TV</string>
+    <string name="phone_layout">Layout de Celular</string>
+
+    <string name="primary_color_settings">Cor Primária</string>
+    <string name="app_theme_settings">Tema do App</string>
+	
+	<!-- account stuff -->
+    <string name="account">Conta</string>
+    <string name="logout">Sair</string>
+    <string name="login">Autenticar</string>
+    <string name="switch_account">Mudar de conta</string>
+    <string name="add_account">Adicionar conta</string>
+    <!-- ============ -->
+    <string name="none">Nenhuma</string>
+    <string name="normal">Normal</string>
+    <string name="all">Todos</string>
+    <string name="max">Max</string>
+    <string name="min">Min</string>
+    <string name="subtitles_outline">Esboçado</string>
+    <string name="subtitles_depressed">Deprimido</string>
+    <string name="subtitles_shadow">Sombrado</string>
+    <string name="subtitles_raised">Em Relevo</string>
+    <!--
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see: 
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    -->
+    <string name="subtitles_example_text">Luís argüia à Júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings-ro.xml b/app/src/main/res/values-ro/strings-ro.xml
index 365e6a69..a8376b23 100644
--- a/app/src/main/res/values-ro/strings-ro.xml
+++ b/app/src/main/res/values-ro/strings-ro.xml
@@ -1,188 +1,297 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 <!--Created by The Translator <https://play.google.com/store/apps/details?id=com.sunilpaulmathew.translator>-->
 
-    <string name="result_poster_img_des">Poster</string>
-     <string name="search_poster_img_des">@string/result_poster_img_des</string>
-     <string name="episode_poster_img_des">Episode Poster</string>
-     <string name="home_main_poster_img_des">Main Poster</string>
-     <string name="home_next_random_img_des">Next Random</string>
-     <string name="go_back_img_des">Go back</string>
-     <string name="home_change_provider_img_des">Change Provider</string>
-     <string name="preview_background_img_des">Preview Background</string>
-     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
-     <string name="rated_format" formatted="true">Evaluat: %.1f</string>
-     <string name="new_update_format" formatted="true">Noua actualizare găsită!\n%s -> %s</string>
-     <string name="filler_format" formatted="true">(Umplut) %s</string>
-     <string name="app_name">CloudStream</string>
-     <string name="title_home">Principal</string>
-     <string name="title_search">Căutare</string>
-     <string name="title_downloads">Descărcări</string>
-     <string name="title_settings">Opțiuni</string>
-     <string name="search_hint">Căutare…</string>
-     <string name="no_data">Fără date</string>
-     <string name="episode_more_options_des">Mai Multe Opțiuni</string>
-     <string name="next_episode">Următorul episod</string>
-     <string name="result_tags">Genuri</string>
-     <string name="result_share">Partajare</string>
-     <string name="result_open_in_browser">Deschideți în browser</string>
-     <string name="skip_loading">Săriți încărcarea</string>
-     <string name="loading_chromecast">Încărcare…</string>
-     <string name="type_watching">Urmărind</string>
-     <string name="type_on_hold">În așteptare</string>
-     <string name="type_completed">Finalizat</string>
-     <string name="type_dropped">Renunțat</string>
-     <string name="type_plan_to_watch">Planificare pentru a urmări</string>
-     <string name="type_none">Niciunul</string>
-     <string name="play_movie_button">Urmăriți filmul</string>
-     <string name="play_torrent_button">Stream Torrent</string>
-     <string name="pick_source">Surse</string>
-     <string name="pick_subtitle">Subtitrare</string>
-     <string name="reload_error">Reîncercarea conexiunii…</string>
-     <string name="result_go_back">Întoarce-te</string>
-     <string name="play_episode">Redă episodul</string>
-     <string name="download">Descărcare</string>
-     <string name="downloaded">Descărcat</string>
-     <string name="downloading">Descărcând</string>
-     <string name="download_paused">Descărcare în Pauză</string>
-     <string name="download_started">Descărcare Începută</string>
-     <string name="download_failed">Descărcare Eșuată</string>
-     <string name="download_canceled">Descărcare Anulată</string>
-     <string name="download_done">Descărcare Finalizată</string>
-     <string name="error_loading_links_toast">Eroare de Încărcare a Linkurilor</string>
-     <string name="download_storage_text">Memorie Internă</string>
-     <string name="app_dubbed_text">Dub</string>
-     <string name="app_subbed_text">Sub</string>
-     <string name="popup_delete_file">Șterge Fișierul</string>
-     <string name="popup_play_file">Redare Fișierul</string>
-     <string name="popup_resume_download">Continuați Descărcarea</string>
-     <string name="popup_pause_download">Pauză Descărcare</string>
-     <string name="pref_disable_acra">Dezactivați raportarea automată a erorilor</string>
-     <string name="home_more_info">Mai multe info</string>
-     <string name="home_expanded_hide">Ascunde</string>
-     <string name="home_play">Începe</string>
-     <string name="home_info">Info</string>
-     <string name="filter_bookmarks">Filtrează Marcajele</string>
-     <string name="error_bookmarks_text">Marcajele</string>
-     <string name="action_remove_from_bookmarks">Eliminați</string>
-     <string name="sort_apply">Aplicați</string>
-     <string name="sort_cancel">Anulați</string>
-     <string name="player_speed">Viteza de Redare</string>
-     <string name="subtitles_settings">Opțiuni de Subtitrare</string>
-     <string name="subs_text_color">Culoarea Textului</string>
-     <string name="subs_outline_color">Culoarea Conturului</string>
-     <string name="subs_background_color">Culoarea de Fundal</string>
-     <string name="subs_window_color">Culoarea Ferestrei</string>
-     <string name="subs_edge_type">Tipul de Margine</string>
-     <string name="subs_subtitle_elevation">Elevația Subtitrărilor</string>
-     <string name="subs_font">Fontul</string>
-     <string name="subs_font_size">Dimensiunea Fontului</string>
-     <string name="search_provider_text_providers">Căutare cu ajutorul furnizorilor</string>
-     <string name="search_provider_text_types">Căutare utilizând tipuri</string>
-     <string name="benene_count_text">%d Benenes date la dezvii</string>
-     <string name="benene_count_text_none">Fără Beneni administrați</string>
-     <string name="subs_auto_select_language">Auto-selectare Limbă</string>
-     <string name="subs_download_languages">Descărcați Limbi</string>
-     <string name="subs_hold_to_reset_to_default">Țineți apăsat pentru a reseta la valorile implicite</string>
-     <string name="continue_watching">Continuă să Urmărești</string>
-     <string name="action_remove_watching">Eliminați</string>
-     <string name="action_open_watching">Mai Multe Info</string>
-     <string name="vpn_might_be_needed">Este posibil să fie necesar un VPN pentru ca acest furnizor să funcționeze corect</string>
-     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
-     <string name="torrent_plot">Descriere</string>
-     <string name="normal_no_plot">Nici o Parcelă Găsită</string>
-     <string name="torrent_no_plot">Nicio Descriere Găsită</string>
-     <string name="picture_in_picture">Picture-in-picture</string>
-     <string name="picture_in_picture_des">Continuă redarea într-un player în miniatură deasupra altor aplicații</string>
-     <string name="player_size_settings">Butonul de Redimensionare a Playerului</string>
-     <string name="player_size_settings_des">Eliminați marginile negre</string>
-     <string name="player_subtitles_settings">Subtitrare</string>
-     <string name="player_subtitles_settings_des">Opțiuni de subtitrare a Playerului</string>
-     <string name="eigengraumode_settings">Modul Eigengravy</string>
-     <string name="eigengraumode_settings_des">Adaugă un buton de viteză în player</string>
-     <string name="swipe_to_seek_settings">Glisați pentru a căuta</string>
-     <string name="swipe_to_seek_settings_des">Glisați la stânga sau la dreapta pentru a controla timpul în player</string>
-     <string name="swipe_to_change_settings">Glisați pentru a ajusta opțiunile</string>
-     <string name="swipe_to_change_settings_des">Glisați pe partea stângă sau dreaptă pentru a schimba luminozitatea sau volumul</string>
-     <string name="double_tap_to_seek_settings">Atingeți dublu pentru a căuta</string>
-     <string name="use_system_brightness_settings">Utilizați luminozitatea sistemului</string>
-     <string name="use_system_brightness_settings_des">Utilizați luminozitatea sistemului în playerul aplicației în loc de o suprapunere întunecată</string>
-     <string name="search">Căutare</string>
-     <string name="settings_info">Info</string>
-     <string name="advanced_search">Căutare Avansată</string>
-     <string name="advanced_search_des">Afișează rezultatele căutării sortate după furnizor</string>
-     <string name="bug_report_settings_off">Trimite numai rapoarte de accident</string>
-     <string name="bug_report_settings_on">Nu trimite date</string>
-     <string name="show_fillers_settings">Arată episoade de umplutură anime</string>
-     <string name="updates_settings">Afișați actualizările aplicației</string>
-     <string name="updates_settings_des">Căutare automată a noilor actualizări la pornire</string>
-     <string name="uprereleases_settings">Actualizare la pre-lansări</string>
-     <string name="uprereleases_settings_des">Căutați doar actualizări de pre-lansare în loc de versiuni complete</string>
-     <string name="github">Github</string>
-     <string name="lightnovel">Aplicația light novel de către aceiași dezvii</string>
-     <string name="discord">Alăturați-vă Discord</string>
-     <string name="benene">Dați un benene pentru dezvii</string>
-     <string name="benene_des">Benene dat</string>
-     <string name="app_language">Limba Aplicației</string>
-     <string name="no_chomecast_support_toast">Acest furnizor nu are suport pentru Chromecast</string>
-     <string name="no_links_found_toast">Niciun Link Găsit</string>
-     <string name="copy_link_toast">Link copiat în clipboard</string>
-     <string name="play_episode_toast">Redă episodul</string>
-     <string name="subs_default_reset_toast">Resetarea la valoarea implicită</string>
-     <string name="season">Sezonul</string>
-     <string name="no_season">Fără Sezon</string>
-     <string name="episode">Episodul</string>
-     <string name="episodes">Episoade</string>
-     <string name="season_short">S</string>
-     <string name="episode_short">E</string>
-     <string name="delete_file">Șterge Fișierul</string>
-     <string name="delete">Șterge</string>
-     <string name="pause">Pauză</string>
-     <string name="resume">Continuarea</string>
-     <string name="delete_message">Acest lucru va șterge definitiv %s\nEști sigur?</string>
-     <string name="status_ongoing">În Curs </string>
-     <string name="status_completed">Încheiat</string>
-     <string name="status">Status</string>
-     <string name="year">An</string>
-     <string name="rating">Rating</string>
-     <string name="duration">Durată</string>
-     <string name="site">Site-ul</string>
-     <string name="synopsis">Sinopsis</string>
-     <string name="queued">În coadă</string>
-     <string name="no_subtitles">Fără Subtitrări</string>
-     <string name="default_subtitles">Implicit</string>
-     <string name="free_storage">Liberă</string>
-     <string name="used_storage">Utilizată</string>
-     <string name="app_storage">Aplicație</string>
-     <string name="movies">Filme</string>
-     <string name="tv_series">Serial TV</string>
-     <string name="cartoons">Caricaturi</string>
-     <string name="anime">Anime</string>
-     <string name="torrent">Torrent</string>
-     <string name="source_error">Eroare de sursă</string>
-     <string name="remote_error">Eroare de telecomandă</string>
-     <string name="render_error">Eroare de randare</string>
-     <string name="unexpected_error">Eroare neașteptată a playerului</string>
-     <string name="storage_error">Eroare de descărcare; verificați permisiunile de stocare</string>
-     <string name="episode_action_chomecast_episode">Chromecast Acest Episod</string>
-     <string name="episode_action_chomecast_mirror">Chromecast Acest Oglindă</string>
-     <string name="episode_action_play_in_app">Redă în Aplicație</string>
-     <string name="episode_action_play_in_vlc">Redă în VLC</string>
-     <string name="episode_action_play_in_browser">Redă în Browser</string>
-     <string name="episode_action_copy_link">copie Link-ul</string>
-     <string name="episode_action_auto_download">Auto-descărcare</string>
-     <string name="episode_action_download_mirror">Descărcare Oglindă</string>
-     <string name="episode_action_reload_links">Reîncărcare Link-uri</string>
-     <string name="no_update_found">Nicio Actualizare Găsită</string>
-     <string name="check_for_update">Verificați dacă există Actualizări</string>
-     <string name="video_lock">Blocare</string>
-     <string name="video_aspect_ratio_resize">Redimensionați</string>
-     <string name="video_source">Sursă</string>
-     <string name="video_skip_op">Săriți OP</string>
-     <string name="dont_show_again">Nu mai apare din nou</string>
-     <string name="update">Actualizare</string>
-     <string name="watch_quality_pref">Calitatea Preferată</string>
-     <string name="display_subbed_dubbed_settings">Afișarea Anime-ului Dublat/Subtitrat</string>
-     <string name="resize_fit">Se Potrivesc la Ecran</string>
-     <string name="resize_fill">Întindere</string>
-     <string name="resize_zoom">Mărire</string>
+	<!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
+    <string name="result_poster_img_des">Afiș</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Afișul Episodului</string>
+    <string name="home_main_poster_img_des">Afiș Principal</string>
+    <string name="home_next_random_img_des">Următor Aleatoriu</string>
+    <string name="go_back_img_des">Înapoi</string>
+    <string name="home_change_provider_img_des">Schimbați furnizorul</string>
+    <string name="preview_background_img_des">Previzualizare fundal</string>
+	
+	<!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+    <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
+    <string name="rated_format" formatted="true">Evaluat: %.1f</string>
+    <string name="new_update_format" formatted="true">Noua actualizare găsită!\n%s -> %s</string>
+    <string name="filler_format" formatted="true">(Umplut) %s</string>
+	
+    <string name="app_name">CloudStream</string>
+    <string name="title_home">Principal</string>
+    <string name="title_search">Căutare</string>
+    <string name="title_downloads">Descărcări</string>
+    <string name="title_settings">Opțiuni</string>
+	
+    <string name="search_hint">Căutare…</string>
+    <string name="no_data">Fără date</string>
+    <string name="episode_more_options_des">Mai Multe Opțiuni</string>
+    <string name="next_episode">Următorul episod</string>
+    <string name="result_tags">Genuri</string>
+    <string name="result_share">Partajare</string>
+    <string name="result_open_in_browser">Deschideți în browser</string>
+    <string name="skip_loading">Săriți încărcarea</string>
+    <string name="loading_chromecast">Încărcare…</string>
+    
+	<string name="type_watching">Urmărind</string>
+    <string name="type_on_hold">În așteptare</string>
+    <string name="type_completed">Finalizat</string>
+    <string name="type_dropped">Renunțat</string>
+    <string name="type_plan_to_watch">Planificare pentru a urmări</string>
+    <string name="type_none">Niciunul</string>
+	<string name="type_re_watching">ReUrmare</string>
+	
+    <string name="play_movie_button">Urmăriți Filmul</string>
+    <string name="play_torrent_button">Stream Torrent</string>
+    <string name="pick_source">Surse</string>
+    <string name="pick_subtitle">Subtitrare</string>
+    <string name="reload_error">Reîncercarea conexiunii…</string>
+    <string name="result_go_back">Întoarce-te</string>
+    <string name="play_episode">Redă episodul</string>
+    
+	<string name="download">Descărcare</string>
+    <string name="downloaded">Descărcat</string>
+    <string name="downloading">Descărcând</string>
+    <string name="download_paused">Descărcare în Pauză</string>
+    <string name="download_started">Descărcare Începută</string>
+    <string name="download_failed">Descărcare Eșuată</string>
+    <string name="download_canceled">Descărcare Anulată</string>
+    <string name="download_done">Descărcare Finalizată</string>
+	
+    <string name="error_loading_links_toast">Eroare de Încărcare a Linkurilor</string>
+    <string name="download_storage_text">Memorie Internă</string>
+	
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+	
+    <string name="popup_delete_file">Șterge Fișierul</string>
+    <string name="popup_play_file">Redare Fișierul</string>
+    <string name="popup_resume_download">Continuați Descărcarea</string>
+    <string name="popup_pause_download">Pauză Descărcare</string>
+	
+    <string name="pref_disable_acra">Dezactivați raportarea automată a erorilor</string>
+    <string name="home_more_info">Mai multe info</string>
+    <string name="home_expanded_hide">Ascunde</string>
+    <string name="home_play">Începe</string>
+    <string name="home_info">Info</string>
+    <string name="filter_bookmarks">Filtrează Marcajele</string>
+    <string name="error_bookmarks_text">Marcajele</string>
+    <string name="action_remove_from_bookmarks">Eliminați</string>
+    <string name="sort_apply">Aplicați</string>
+    <string name="sort_cancel">Anulați</string>
+    <string name="player_speed">Viteza de Redare</string>
+	
+    <string name="subtitles_settings">Opțiuni de Subtitrare</string>
+    <string name="subs_text_color">Culoarea Textului</string>
+    <string name="subs_outline_color">Culoarea Conturului</string>
+    <string name="subs_background_color">Culoarea de Fundal</string>
+    <string name="subs_window_color">Culoarea Ferestrei</string>
+    <string name="subs_edge_type">Tipul de Margine</string>
+    <string name="subs_subtitle_elevation">Elevația Subtitrărilor</string>
+    <string name="subs_font">Fontul</string>
+    <string name="subs_font_size">Dimensiunea Fontului</string>
+	
+    <string name="search_provider_text_providers">Căutare cu ajutorul furnizorilor</string>
+    <string name="search_provider_text_types">Căutare utilizând tipuri</string>
+	
+    <string name="benene_count_text">%d Benenes date la dezvoltatorilor</string>
+    <string name="benene_count_text_none">Fără Beneni administrați</string>
+	
+    <string name="subs_auto_select_language">Auto-selectare Limbă</string>
+    <string name="subs_download_languages">Descărcați Limbi</string>
+    <string name="subs_hold_to_reset_to_default">Țineți apăsat pentru a reseta la valorile implicite</string>
+    <string name="continue_watching">Continuă să Urmărești</string>
+    
+	<string name="action_remove_watching">Eliminați</string>
+    <string name="action_open_watching">Mai Multe Info</string>
+    
+	<string name="vpn_might_be_needed">Este posibil să fie necesar un VPN pentru ca acest furnizor să funcționeze corect</string>
+    <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
+	
+	<string name="provider_info_meta">Metadatele nu sunt furnizate de site, este posibil ca încărcarea videoclipului să eșueze.</string>
+    
+	<string name="torrent_plot">Descriere</string>
+    <string name="normal_no_plot">Nici o Parcelă Găsită</string>
+    <string name="torrent_no_plot">Nicio Descriere Găsită</string>
+	
+    <string name="picture_in_picture">Picture-in-picture</string>
+    <string name="picture_in_picture_des">Continuă redarea într-un player în miniatură deasupra altor aplicații</string>
+    <string name="player_size_settings">Butonul de Redimensionare a Playerului</string>
+    <string name="player_size_settings_des">Eliminați marginile negre</string>
+    <string name="player_subtitles_settings">Subtitrare</string>
+    <string name="player_subtitles_settings_des">Opțiuni de subtitrare a Playerului</string>
+    <string name="eigengraumode_settings">Modul Eigengravy</string>
+    <string name="eigengraumode_settings_des">Adaugă un buton de viteză în player</string>
+    <string name="swipe_to_seek_settings">Glisați pentru a căuta</string>
+    <string name="swipe_to_seek_settings_des">Glisați la stânga sau la dreapta pentru a controla timpul în player</string>
+    <string name="swipe_to_change_settings">Glisați pentru a ajusta opțiunile</string>
+    <string name="swipe_to_change_settings_des">Glisați pe partea stângă sau dreaptă pentru a schimba luminozitatea sau volumul</string>
+    <string name="double_tap_to_seek_settings">Atingeți dublu pentru a căuta</string>
+    <string name="use_system_brightness_settings">Utilizați luminozitatea sistemului</string>
+    <string name="use_system_brightness_settings_des">Utilizați luminozitatea sistemului în playerul aplicației în loc de o suprapunere întunecată</string>
+	
+    <string name="search">Căutare</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Căutare Avansată</string>
+    <string name="advanced_search_des">Afișează rezultatele căutării sortate după furnizor</string>
+    <string name="bug_report_settings_off">Trimite numai rapoarte de accident</string>
+    <string name="bug_report_settings_on">Nu trimite date</string>
+    <string name="show_fillers_settings">Arată episoade de umplutură anime</string>
+    <string name="updates_settings">Afișați actualizările aplicației</string>
+    <string name="updates_settings_des">Căutare automată a noilor actualizări la pornire</string>
+    <string name="uprereleases_settings">Actualizare la pre-lansări</string>
+    <string name="uprereleases_settings_des">Căutați doar actualizări de pre-lansare în loc de versiuni complete</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Aplicația light novel de către aceiași dezvoltatorilor</string>
+	<string name="anim">Aplicație anime de aceiași dezvoltatorilor</string>
+    <string name="discord">Alăturați-vă Discord</string>
+    <string name="benene">Dați un benene pentru dezvoltatorilor</string>
+    <string name="benene_des">Benene dat</string>
+	
+    <string name="app_language">Limba Aplicației</string>
+	
+    <string name="no_chomecast_support_toast">Acest furnizor nu are suport pentru Chromecast</string>
+    <string name="no_links_found_toast">Niciun Link Găsit</string>
+    <string name="copy_link_toast">Link copiat în clipboard</string>
+    <string name="play_episode_toast">Redă episodul</string>
+    <string name="subs_default_reset_toast">Resetarea la valoarea implicită</string>
+	<string name="acra_report_toast">Ne pare rău, aplicația s-a blocat. Un raport de eroare anonim va fi trimis la
+       dezvoltatorilor
+    </string>
+	
+    <string name="season">Sezonul</string>
+    <string name="no_season">Fără Sezon</string>
+    <string name="episode">Episodul</string>
+    <string name="episodes">Episoade</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+	
+    <string name="delete_file">Șterge Fișierul</string>
+    <string name="delete">Șterge</string>
+    <string name="pause">Pauză</string>
+    <string name="resume">Continuarea</string>
+    <string name="delete_message">Acest lucru va șterge definitiv %s\nEști sigur?</string>
+    
+	<string name="status_ongoing">În Curs </string>
+    <string name="status_completed">Încheiat</string>
+    <string name="status">Status</string>
+    <string name="year">An</string>
+    <string name="rating">Rating</string>
+    <string name="duration">Durată</string>
+    <string name="site">Site-ul</string>
+    <string name="synopsis">Sinopsis</string>
+    
+	<string name="queued">În coadă</string>
+    <string name="no_subtitles">Fără Subtitrări</string>
+    <string name="default_subtitles">Implicit</string>
+    
+	<string name="free_storage">Liberă</string>
+    <string name="used_storage">Utilizată</string>
+    <string name="app_storage">Aplicație</string>
+    
+	<!--plural-->
+	<string name="movies">Filme</string>
+    <string name="tv_series">Serial TV</string>
+    <string name="cartoons">Caricaturi</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrent</string>
+	<string name="documentaries">Filme Documentare</string>
+	
+	<!--singular-->
+    <string name="movies_singular">Filmul</string>
+    <string name="tv_series_singular">Serie</string>
+    <string name="cartoons_singular">Caricatur</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Documentar</string>
+    
+	<string name="source_error">Eroare de sursă</string>
+    <string name="remote_error">Eroare de telecomandă</string>
+    <string name="render_error">Eroare de randare</string>
+    <string name="unexpected_error">Eroare neașteptată a playerului</string>
+    <string name="storage_error">Eroare de descărcare; verificați permisiunile de stocare</string>
+    
+	<string name="episode_action_chomecast_episode">Chromecast Acest Episod</string>
+    <string name="episode_action_chomecast_mirror">Chromecast Acest Oglindă</string>
+    <string name="episode_action_play_in_app">Redă în Aplicație</string>
+    <string name="episode_action_play_in_vlc">Redă în VLC</string>
+    <string name="episode_action_play_in_browser">Redă în Browser</string>
+    <string name="episode_action_copy_link">copie Link-ul</string>
+    <string name="episode_action_auto_download">Auto-descărcare</string>
+    <string name="episode_action_download_mirror">Descărcare Oglindă</string>
+    <string name="episode_action_reload_links">Reîncărcare Link-uri</string>
+    
+	<string name="no_update_found">Nicio Actualizare Găsită</string>
+    <string name="check_for_update">Verificați dacă există Actualizări</string>
+    
+	<string name="video_lock">Blocare</string>
+    <string name="video_aspect_ratio_resize">Redimensionați</string>
+    <string name="video_source">Sursă</string>
+    <string name="video_skip_op">Săriți OP</string>
+    
+	<string name="dont_show_again">Nu mai apare din nou</string>
+    <string name="update">Actualizare</string>
+    <string name="watch_quality_pref">Calitatea Preferată</string>
+	<string name="dns_pref">DNS prin HTTPS</string>
+    <string name="dns_pref_summary">Util pentru ocolirea blocurilor ISP</string>
+	
+	<string name="download_path_pref">Calea de descărcare</string>
+    
+	<string name="display_subbed_dubbed_settings">Afișarea Anime-ului Dublat/Subtitrat</string>
+    
+	<string name="resize_fit">Se Potrivesc la Ecran</string>
+    <string name="resize_fill">Întindere</string>
+    <string name="resize_zoom">Mărire</string>
+	
+	<string name="legal_notice">Renunțare de responsabilitate</string>
+    <string name="legal_notice_text">Orice probleme juridice legate de conținutul acestei aplicații
+        ar trebui să fie rezolvate cu gazdele și furnizorii de fișiere, deoarece noi nu suntem afiliați cu aceștia.
+
+        În caz de încălcare a drepturilor de autor, vă rugăm să contactați direct părțile responsabile sau site-urile de streaming.
+
+        Aplicația este destinată exclusiv utilizării educaționale și personale.
+
+        CloudStream 3 nu găzduiește niciun fel de conținut în aplicație și nu are niciun control asupra conținutului media care este pus sau retras.
+        CloudStream 3 funcționează ca orice alt motor de căutare, cum ar fi Google. CloudStream 3 nu găzduiește, nu încarcă sau
+        gestionează niciun videoclip, film sau conținut. Pur și simplu răscolește, agregă și afișează link-uri într-un mod convenabil,
+        interfață convenabilă și ușor de utilizat.
+
+        Pur și simplu, acesta extrage site-urile web ale unor terțe părți care sunt accesibile publicului prin intermediul oricărui browser web obișnuit. Este
+        responsabilitatea utilizatorului de a evita orice acțiune care ar putea încălca legile care guvernează localitatea sa. Utilizați
+        CloudStream 3 pe propriul risc.
+    </string>
+    <string name="general">Generală</string>
+    <string name="provider_lang_settings">Limbile Furnizorului</string>
+    <string name="app_layout">Aranjament-ul Aplicației</string>
+    <string name="preferred_media_settings">Media Preferată</string>
+
+    <string name="automatic">Auto</string>
+    <string name="tv_layout">Aranjament TV</string>
+    <string name="phone_layout">Aranjament Telefonului</string>
+
+    <string name="primary_color_settings">Culoare primară</string>
+	<string name="app_theme_settings">Tema Aplicației</string>
+	
+	<!-- account stuff -->
+    <string name="account">contul</string>
+    <string name="logout">Ieșire</string>
+    <string name="login">Conectare</string>
+    <string name="switch_account">Schimbați contul</string>
+    <string name="add_account">Adăugați contul</string>
+    <!-- ============ -->
+    <string name="none">Niciunul</string>
+    <string name="normal">Normală</string>
+    <string name="all">Toate</string>
+    <string name="max">Max</string>
+    <string name="min">Min</string>
+    <string name="subtitles_outline">Contur</string>
+    <string name="subtitles_depressed">Deprimată</string>
+    <string name="subtitles_shadow">Umbră</string>
+    <string name="subtitles_raised">În relief</string>
+	<!--
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see: 
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    -->
+	<string name="subtitles_example_text">Gheorghe, obezul, a reuşit să obţină jucându-se un flux în Quebec de o mie kilowaţioră</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7a9e4d43..4146520a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
 
     <color name="textColor">#e9eaee</color> <!--FFF-->
     <color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
+    <color name="grayShimmer">#DCDCDC</color> <!-- 5e5f62-->
 
     <color name="searchColorTransparent">#1AFFFFFF</color> <!--DADADA-->
     <color name="transparent">#00000000</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c00bb6d1..e0accac5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,4 +6,10 @@
     <dimen name="navbar_height">0dp</dimen>
     <dimen name="card_corner_radius">2dp</dimen>
     <dimen name="result_padding">15dp</dimen>
+
+    <dimen name="loading_line_height">15dp</dimen>
+    <dimen name="loading_radius">3dp</dimen>
+    <dimen name="loading_margin">15dp</dimen>
+
+    <integer name="loading_time">2000</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9cc842c7..e1e451ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,7 +145,7 @@
     <string name="benene_count_text">%d Benenes given to devs</string>
     <string name="benene_count_text_none">No Benenes given</string>
 
-    <string name="subs_auto_select_language">Auto Select Language</string>
+    <string name="subs_auto_select_language">Auto-Select Language</string>
     <string name="subs_download_languages">Download Languages</string>
     <string name="subs_hold_to_reset_to_default">Hold to reset to default</string>
     <string name="continue_watching">Continue Watching</string>
@@ -169,7 +169,7 @@
     <string name="player_subtitles_settings">Subtitles</string>
     <string name="player_subtitles_settings_des">Player subtitles settings</string>
     <string name="eigengraumode_settings">Eigengravy Mode</string>
-    <string name="eigengraumode_settings_des">Adds the speed option in the player</string>
+    <string name="eigengraumode_settings_des">Adds a speed option in the player</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
     <string name="swipe_to_seek_settings_des">Swipe left or right to control time in the videoplayer</string>
     <string name="swipe_to_change_settings">Swipe to change settings</string>
@@ -178,7 +178,7 @@
     <string name="double_tap_to_seek_settings_des">Tap twice on the right or left side to seek forwards or backwards
     </string>
     <string name="use_system_brightness_settings">Use system brightness</string>
-    <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of an dark
+    <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark
         overlay
     </string>
 
@@ -202,7 +202,7 @@
 
     <string name="app_language">App Language</string>
 
-    <string name="no_chomecast_support_toast">This provider has no chromecast support</string>
+    <string name="no_chomecast_support_toast">This provider has no Chromecast support</string>
     <string name="no_links_found_toast">No Links Found</string>
     <string name="copy_link_toast">Link copied to clipboard</string>
     <string name="play_episode_toast">Play Episode</string>
@@ -244,18 +244,18 @@
 
     <!--plural-->
     <string name="movies">Movies</string>
-    <string name="tv_series">TvSeries</string>
+    <string name="tv_series">TV Series</string>
     <string name="cartoons">Cartoons</string>
     <string name="anime">Anime</string>
-    <string name="torrent">Torrent</string>
+    <string name="torrent">Torrents</string>
     <string name="documentaries">Documentaries</string>
 
     <!--singular-->
-    <string name="movies_singular">@string/movies</string>
+    <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Series</string>
     <string name="cartoons_singular">Cartoon</string>
     <string name="anime_singular">@string/anime</string>
-    <string name="torrent_singular">@string/torrent</string>
+    <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentary</string>
 
     <string name="source_error">Source error</string>
@@ -320,7 +320,7 @@
     <string name="preferred_media_settings">Preferred Media</string>
 
     <string name="automatic">Auto</string>
-    <string name="tv_layout">Tv Layout</string>
+    <string name="tv_layout">TV Layout</string>
     <string name="phone_layout">Phone Layout</string>
 
     <string name="primary_color_settings">Primary Color</string>
@@ -355,8 +355,10 @@
     <string name="subtitles_shadow">Shadow</string>
     <string name="subtitles_raised">Raised</string>
     <!--
-    Example text does not need to be translated and if you do translate include all the letters in the alphabet,
-    see https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see: 
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
     <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8a37a51a..6a7b9518 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -315,7 +315,10 @@
         <item name="strokeColor">@color/toggle_button_outline</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">45dp</item>
-        <item name="android:padding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">10dp</item>
         <!--<item name="android:layout_marginStart">10dp</item>-->
         <item name="android:layout_marginEnd">5dp</item>
         <item name="textAllCaps">false</item>