diff --git a/README.md b/README.md
index 30711f66..e2066fc8 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ https://discord.gg/5Hus6fM
 * 🇵🇱 Polish
 * 🇮🇳 Hindi
 * 🇮🇳 Malayalam
+* 🇪🇸 Spanish
 
 ***SCREENSHOTS:***
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 8788a1b3..8f1cc06c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -28,6 +28,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     // idk, if you find a way of automating this it would be great
     private val languages = arrayListOf(
+        Triple("\uD83C\uDDEC\uD83C\uDDE7", "Spanish", "es"),
         Triple("\uD83C\uDDEC\uD83C\uDDE7", "English", "en"),
         Triple("\uD83C\uDDFB\uD83C\uDDF3", "Viet Nam", "vi"),
         Triple("\uD83C\uDDF3\uD83C\uDDF1", "Dutch", "nl"),
diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
new file mode 100644
index 00000000..048eec5a
--- /dev/null
+++ b/app/src/main/res/values-es/strings-es.xml
@@ -0,0 +1,189 @@
+<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">Velocidad (%.2fx)</string>
+     <string name="rated_format" formatted="true">Puntuado: %.1f</string>
+     <string name="new_update_format" formatted="true">¡Nueva actualización encontrada!\n%s -> %s</string>
+     <string name="filler_format" formatted="true">(Relleno) %s</string>
+     <string name="app_name">CloudStream</string>
+     <string name="title_home">Inicio</string>
+     <string name="title_search">Buscar</string>
+     <string name="title_downloads">Descargas</string>
+     <string name="title_settings">Ajustes</string>
+     <string name="search_hint">Buscar…</string>
+     <string name="no_data">No hay datos</string>
+     <string name="episode_more_options_des">Más Opciones</string>
+     <string name="next_episode">Siguiente capítulo</string>
+     <string name="result_tags">Géneros</string>
+     <string name="result_share">Compartir</string>
+     <string name="result_open_in_browser">Abrir en Navegador</string>
+     <string name="skip_loading">Saltar Carga</string>
+     <string name="loading_chromecast">Cargando…</string>
+     <string name="type_watching">Viendo</string>
+     <string name="type_on_hold">En espera</string>
+     <string name="type_completed">Completada</string>
+     <string name="type_dropped">Dejada</string>
+     <string name="type_plan_to_watch">Se planea ver</string>
+     <string name="type_none">Ninguno</string>
+     <string name="play_movie_button">Mirar Película</string>
+     <string name="play_torrent_button">Stream Torrent</string>
+     <string name="pick_source">Fuentes</string>
+     <string name="pick_subtitle">Subtítulos</string>
+     <string name="reload_error">Reintentar conexión…</string>
+     <string name="result_go_back">Ir atrás</string>
+     <string name="play_episode">Reproducir capítulo</string>
+     <string name="download">Descarga</string>
+     <string name="downloaded">Descargada</string>
+     <string name="downloading">Descargando</string>
+     <string name="download_paused">Descarga Pausada</string>
+     <string name="download_started">Descarga Iniciada</string>
+     <string name="download_failed">Descarga Fallida</string>
+     <string name="download_canceled">Descarga Cancelada</string>
+     <string name="download_done">Descarga Terminada</string>
+     <string name="error_loading_links_toast">Error Cargando Links</string>
+     <string name="download_storage_text">Almacenamiento Interno</string>
+     <string name="app_dubbed_text">Dub</string>
+     <string name="app_subbed_text">Sub</string>
+     <string name="popup_delete_file">Eliminar Archivo</string>
+     <string name="popup_play_file">Reproducir Archivo</string>
+     <string name="popup_resume_download">Reanudar Descarga</string>
+     <string name="popup_pause_download">Pausar Descarga</string>
+     <string name="pref_disable_acra">Deshabilitar reporte de bugs automático</string>
+     <string name="home_more_info">Más info</string>
+     <string name="home_expanded_hide">Esconder</string>
+     <string name="home_play">Reproducir</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">Remover</string>
+     <string name="sort_apply">Aplicar</string>
+     <string name="sort_cancel">Cancelar</string>
+     <string name="player_speed">Velocidad de Reproductor</string>
+     <string name="subtitles_settings">Ajustes de Subtítulos</string>
+     <string name="subs_text_color">Color de Texto</string>
+     <string name="subs_outline_color">Color de Delineado</string>
+     <string name="subs_background_color">Color de Fondo</string>
+     <string name="subs_window_color">Color de Ventana</string>
+     <string name="subs_edge_type">Tipo de Borde</string>
+     <string name="subs_subtitle_elevation">Elevación de Subtítulo</string>
+     <string name="subs_font">Fuente</string>
+     <string name="subs_font_size">Tamaño de Fuente</string>
+     <string name="search_provider_text_providers">Buscar usando proveedores</string>
+     <string name="search_provider_text_types">Buscar usando tipos</string>
+     <string name="benene_count_text">%d Benenes dadas a los devs</string>
+     <string name="benene_count_text_none">No se dieron Benenes</string>
+     <string name="subs_auto_select_language">Auto-elegir Idioma</string>
+     <string name="subs_download_languages">Descargar Idiomas</string>
+     <string name="subs_hold_to_reset_to_default">Mantener para resetear a default</string>
+     <string name="continue_watching">Seguir Viendo</string>
+     <string name="action_remove_watching">Remover</string>
+     <string name="action_open_watching">Más Info</string>
+     <string name="vpn_might_be_needed">Podría necesitarse una VPN para que este proveedor funcione correctamente</string>
+     <string name="vpn_torrent">Este proveedor es un torrent; se recomienda una VPN</string>
+     <string name="torrent_plot">Descripción</string>
+     <string name="normal_no_plot">Trama No Encontrada</string>
+     <string name="torrent_no_plot">Descripción No Encontrada</string>
+     <string name="picture_in_picture">Picture-in-picture</string>
+     <string name="picture_in_picture_des">Continúa reproduciendo en un player miniatura por encima de otras apps</string>
+     <string name="player_size_settings">Botón Cambiar Tamaño de player</string>
+     <string name="player_size_settings_des">Quitar bordes negros</string>
+     <string name="player_subtitles_settings">Subtítulos</string>
+     <string name="player_subtitles_settings_des">Ajustes de subtítulos del Player</string>
+     <string name="eigengraumode_settings">Modo Eigengravy</string>
+     <string name="eigengraumode_settings_des">Agrega un botón de velocidad en el reproductor</string>
+     <string name="swipe_to_seek_settings">Deslizar para adelantar</string>
+     <string name="swipe_to_seek_settings_des">Deslizar a la izq. o der. para controlar el tiempo en el reproductor</string>
+     <string name="swipe_to_change_settings">Deslizar para cambiar ajustes</string>
+     <string name="swipe_to_change_settings_des">Deslizar en el lado izq. o der. para cambiar brillo o volumen</string>
+     <string name="double_tap_to_seek_settings">Doble toque para adelantar</string>
+     <string name="use_system_brightness_settings">Usar brillo del sistema</string>
+     <string name="use_system_brightness_settings_des">Usar el brillo del sistema en lugar de una capa negra</string>
+     <string name="search">Buscar</string>
+     <string name="settings_info">Info</string>
+     <string name="advanced_search">Búsqueda Avanzada</string>
+     <string name="advanced_search_des">Muestra resultados de búsqueda separador por proveedor</string>
+     <string name="bug_report_settings_off">Sólo envía datos al crashear</string>
+     <string name="bug_report_settings_on">No envía datos</string>
+     <string name="show_fillers_settings">Mostrar episodio relleno para anime</string>
+     <string name="updates_settings">Mostrar actualizaciones de app</string>
+     <string name="updates_settings_des">Busca nuevas actualizaciones al iniciar</string>
+     <string name="uprereleases_settings">Actualizar a Pre-releases</string>
+     <string name="uprereleases_settings_des">Busca actualizaciones pre-release en vez de sólo releases completas</string>
+     <string name="github">Github</string>
+     <string name="lightnovel">App light novel por los mismos devs</string>
+     <string name="discord">Unirse a Discord</string>
+     <string name="benene">Darle benene a los devs</string>
+     <string name="benene_des">Benene dada</string>
+     <string name="app_language">Idioma de App</string>
+     <string name="no_chomecast_support_toast">Este proveedor no tiene soporte para chromecast</string>
+     <string name="no_links_found_toast">Links No Encontrados</string>
+     <string name="copy_link_toast">Link copiado al portapapeles</string>
+     <string name="play_episode_toast">Reproducir capítulo</string>
+     <string name="subs_default_reset_toast">Resetear a valor por defecto</string>
+     <string name="season">Temporada</string>
+     <string name="no_season">Sin Temporada</string>
+     <string name="episode">Capítulo</string>
+     <string name="episodes">Capítulos</string>
+     <string name="season_short">T</string>
+     <string name="episode_short">C</string>
+     <string name="delete_file">Eliminar Archivo</string>
+     <string name="delete">Eliminar</string>
+     <string name="pause">Pausar</string>
+     <string name="resume">Reanudar</string>
+     <string name="delete_message">Esto borrará %s permanentemente\n¿Seguro?</string>
+     <string name="status_ongoing">En Curso</string>
+     <string name="status_completed">Completada</string>
+     <string name="status">Estado</string>
+     <string name="year">Año</string>
+     <string name="rating">Puntaje</string>
+     <string name="duration">Duración</string>
+     <string name="site">Sitio</string>
+     <string name="synopsis">Sinopsis</string>
+     <string name="queued">En cola</string>
+     <string name="no_subtitles">No Hay Subtítulos</string>
+     <string name="default_subtitles">Por Defecto</string>
+     <string name="free_storage">Libre</string>
+     <string name="used_storage">Usado</string>
+     <string name="app_storage">App</string>
+     <string name="movies">Pelis</string>
+     <string name="tv_series">Series de TV</string>
+     <string name="cartoons">Caricaturas</string>
+     <string name="anime">Anime</string>
+     <string name="torrent">Torrent</string>
+     <string name="source_error">Error de fuente</string>
+     <string name="remote_error">Error remoto</string>
+     <string name="render_error">Error de Renderizador</string>
+     <string name="unexpected_error">Error de reproductor inesperado</string>
+     <string name="storage_error">Error de descarga
+ revisar permisos de almacenamiento</string>
+     <string name="episode_action_chomecast_episode">Chromecast al Capítulo</string>
+     <string name="episode_action_chomecast_mirror">Chromecast al Espejo</string>
+     <string name="episode_action_play_in_app">Mirar en App</string>
+     <string name="episode_action_play_in_vlc">Mirar en VLC</string>
+     <string name="episode_action_play_in_browser">Mirar en Navegador</string>
+     <string name="episode_action_copy_link">Copiar Link</string>
+     <string name="episode_action_auto_download">Auto Descargar</string>
+     <string name="episode_action_download_mirror">Descargar Espejo</string>
+     <string name="episode_action_reload_links">Recargar Links</string>
+     <string name="no_update_found">No hay Actualizaciones</string>
+     <string name="check_for_update">Buscar Actualización</string>
+     <string name="video_lock">Fijar</string>
+     <string name="video_aspect_ratio_resize">Cambiar Tamaño</string>
+     <string name="video_source">Fuente</string>
+     <string name="video_skip_op">Saltar OP</string>
+     <string name="dont_show_again">No mostrar de nuevo</string>
+     <string name="update">Actualizar</string>
+     <string name="watch_quality_pref">Calidad Preferida</string>
+     <string name="display_subbed_dubbed_settings">Mostrar Anime Doblado/Subtitulado</string>
+     <string name="resize_fit">Ajustar a Pantalla</string>
+     <string name="resize_fill">Estirar</string>
+     <string name="resize_zoom">Acercar</string>
+</resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt
new file mode 100644
index 00000000..16f7142c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/2.txt
@@ -0,0 +1 @@
+- Changelog added!
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 00000000..e01b7d03
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,14 @@
+CloudStream-3 lets you stream and download Movies, TV-Series and Anime. The app comes without any ads and analytics. It supports multiple trailer & movie sites, and more. Features include:
+
+
+
+Bookmarks
+
+
+Download and stream movies, tv-shows and anime
+
+
+subtitle downloads
+
+
+Chromecast support
diff --git a/fastlane/metadata/android/en-US/images/downloads.jpg b/fastlane/metadata/android/en-US/images/downloads.jpg
new file mode 100644
index 00000000..af6da6b2
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/downloads.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/home.jpg b/fastlane/metadata/android/en-US/images/home.jpg
new file mode 100644
index 00000000..07b1a54c
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/home.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/player.jpg b/fastlane/metadata/android/en-US/images/player.jpg
new file mode 100644
index 00000000..55fb6804
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/player.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/results.jpg b/fastlane/metadata/android/en-US/images/results.jpg
new file mode 100644
index 00000000..4d715be4
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/results.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/search.jpg b/fastlane/metadata/android/en-US/images/search.jpg
new file mode 100644
index 00000000..025f4216
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/search.jpg differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 00000000..83ee1066
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Stream and download Movies, TV-Series and Anime.
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/es-AR/full_description.txt b/fastlane/metadata/android/es-AR/full_description.txt
new file mode 100644
index 00000000..32582b59
--- /dev/null
+++ b/fastlane/metadata/android/es-AR/full_description.txt
@@ -0,0 +1,11 @@
+CloudStream-3 te permite ver y descargar Películas, Series de TV y Anime. La app viene sin anuncios ni análisis. Soporta varios sitios de películas, trailers... Y
+Más. Características incluídas: 
+
+
+Marcadores
+
+Descargar y mirar streams de películas, shows de TV y anime
+
+Descargar subtítulos
+
+Soporte para Chromecast
diff --git a/fastlane/metadata/android/es-AR/short_description.txt b/fastlane/metadata/android/es-AR/short_description.txt
new file mode 100644
index 00000000..dffeaf41
--- /dev/null
+++ b/fastlane/metadata/android/es-AR/short_description.txt
@@ -0,0 +1 @@
+Mirá y descarga Películas, Series y Anime