diff --git a/app/build.gradle b/app/build.gradle
index cf45527ff..37ec0e38e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,6 @@ dependencies {
     compile 'com.github.nirhart:parallaxscroll:1.0'
     compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
     compile 'com.google.code.gson:gson:2.4'
-    compile 'com.nononsenseapps:filepicker:2.0.5'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26788cd1b..fe8bce6d7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,7 +141,7 @@
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
             android:label="@string/app_name"
             android:theme="@style/FilePickerTheme"
-            android:launchMode="singleTask">
+            android:launchMode="singleTop">
         </activity>
 
     </application>
diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
index 3eb982f06..06f3a213d 100644
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
@@ -1,13 +1,8 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
-import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a6b3daec9..f8e11d625 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,2 +1,143 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="main_bg_subtitle">Wciśnij wyszukaj, aby rozpocząć</string>
+    <string name="install">Instaluj</string>
+    <string name="cancel">Anuluj</string>
+    <string name="open_in_browser">Otwórz w przeglądarce</string>
+    <string name="share">Udostępnij</string>
+    <string name="loading">Ładowanie</string>
+    <string name="download">Pobierz</string>
+    <string name="search">Wyszukaj</string>
+    <string name="settings">Ustawienia</string>
+    <string name="did_you_mean">Miałeś na myśli: %1$s ?</string>
+    <string name="search_page">"Szukana strona: "</string>
+    <string name="share_dialog_title">Udostępnij przez</string>
+    <string name="choose_browser">Wybierz przeglądarkę</string>
+    <string name="screen_rotation">rotacja</string>
+    <string name="settings_activity_title">Ustawienia</string>
+    <string name="use_external_video_player_title">Użyj zewnętrznego odtwarzacza video</string>
+    <string name="use_external_audio_player_title">Użyj zewnętrznego odtwarzacza audio</string>
+
+    <string name="view_count_text">%1$s wyświetleń</string>
+    <string name="upload_date_text">Opublikowany w %1$s</string>
+    <string name="no_player_found">Nie znaleziono odtwarzacza strumieni. Zainstalować VLC?</string>
+    <string name="background_player_name">Odtwarzacz w tle NewPipe</string>
+    <string name="download_path_title">Ścieżka zapisu video</string>
+    <string name="download_path_summary">Ścieżka zapisu pobranego video.</string>
+    <string name="download_path_dialog_title">Podaj ścieżkę zapisu video</string>
+
+    <string name="download_path_audio_title">Ścieżka zapisu audio</string>
+    <string name="download_path_audio_summary">Ścieżka zapisu pobranego audio</string>
+    <string name="download_path_audio_dialog_title">Podaj ścieżkę zapisu audio.</string>
+
+    <string name="autoplay_by_calling_app_title">Autoodtwarzanie po wezwaniu z innej aplikacji</string>
+    <string name="autoplay_by_calling_app_summary">Automatycznie odtwórz video kiedy NewPipe zostanie wywołany z innej aplikacji.</string>
+    <string name="default_resolution_title">Domyślna rozdzielczość</string>
+    <string name="play_with_kodi_title">Odtwórz w Kodi</string>
+    <string name="kore_not_found">Aplikacja Kore nie znaleziona. Zainstalować Kore?</string>
+    <string name="show_play_with_kodi_title">Pokaż opcję \"Odtwórz z Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Wyświetl opcję odtwarzania video przez centrum multimedii Kodi.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Domyślny format audio</string>
+    <string name="webm_description">WebM — darmowy format</string>
+    <string name="m4a_description">m4a — lepsza jakość</string>
+    <string name="theme_title">Motyw</string>
+    <string name="dark_theme_title">Ciemny</string>
+    <string name="light_theme_title">Jasny</string>
+
+    <string name="download_dialog_title">Pobieranie</string>
+    <string name="next_video_title">Następne video</string>
+    <string name="show_next_and_similar_title">Pokaż następne i podobne filmy</string>
+    <string name="url_not_supported_toast">URL nie obsługiwany</string>
+    <string name="similar_videos_btn_text">Podobne filmy</string>
+    <string name="search_language_title">Preferowany język zawartości</string>
+    <string name="settings_category_video_audio_title">Video i Audio</string>
+    <string name="settings_category_appearance_title">Wygląd</string>
+    <string name="settings_category_other_title">Inne</string>
+    <string name="background_player_playing_toast">Odtwarzanie w tle</string>
+    <string name="play_btn_text">Odtwórz</string>
+    <string name="content">Zawartość</string>
+    <string name="show_age_restricted_content_title">Pokaż zawartość z ograniczeniem wieku</string>
+    <string name="video_is_age_restricted">Film jest ograniczony wiekowo. Aktywuj najpierw filmy ograniczone wiekowo w ustawieniach.</string>
+    <string name="duration_live">Na żywo</string>
+    <string name="downloads">Pobrania</string>
+    <string name="downloads_title">Pobrania</string>
+    <string name="settings_title">Ustawienia</string>
+    <string name="error_report_title">Raport błędu</string>
+
+    <string name="general_error">Błąd</string>
+    <string name="network_error">Błąd sieci</string>
+    <string name="could_not_load_thumbnails">Nie można załadować wszystkich miniatur</string>
+    <string name="youtube_signature_decryption_error">Nie można zdeszyfrować sygnatury url filmu.</string>
+    <string name="parsing_error">Nie można zanalizować strony.</string>
+    <string name="light_parsing_error">Nie można całkowicie zanalizować strony.</string>
+    <string name="content_not_available">Zawartość niedostępna.</string>
+    <string name="blocked_by_gema">Zablokowane przez GEMA.</string>
+    <string name="could_not_setup_download_menu">Nie można ustawić menu pobierania.</string>
+    <string name="live_streams_not_supported">To jest film NA ŻYWO. Te nie są jeszcze wspierane.</string>
+    <string name="could_not_get_stream">Nie można otrzymać żadnego strumienia.</string>
+    <string name="sorry_string">Przepraszamy, to nie powinno mieć miejsca.</string>
+    <string name="error_report_button_text">Zgłoś błąd przez email</string>
+    <string name="error_snackbar_message">Przepraszamy, wystąpiły pewne błędy.</string>
+    <string name="error_snackbar_action">RAPORT</string>
+    <string name="what_device_headline">Info:</string>
+    <string name="what_happened_headline">Co się stało:</string>
+    <string name="info_labels">Co:\\nŻądanie:\\nJęzyk zawartości:\\nUsługa:\\nCzas GMT:\\nVersion:\\nWersja systemu:\\nGlobalny zakres IP:</string>
+    <string name="info_searched_lbl">Szukane dla:</string>
+    <string name="info_requested_stream_lbl">Żądany strumień:</string>
+    <string name="your_comment">Twój komentarz (po angielsku):</string>
+    <string name="error_details_headline">Szczegóły:</string>
+
+
+    <string name="list_thumbnail_view_description">Miniatura filmu</string>
+    <string name="detail_thumbnail_view_description">Miniatura filmu</string>
+    <string name="detail_uploader_thumbnail_view_description">Miniatura zdjęcia uploadera</string>
+    <string name="detail_likes_img_view_description">Polubienia</string>
+    <string name="detail_dislikes_img_view_description">Niepolubienia</string>
+    <string name="use_tor_title">Użyj Tor</string>
+    <string name="report_error">Zgłoś błąd</string>
+    <string name="user_report">Raport użytkownika</string>
+
+    <string name="err_dir_create">Nie można utworzyć katalogu pobierania \'%1$s\'</string>
+    <string name="info_dir_created">Utworzono katalog pobierania \'%1$s\'</string>
+
+	<string name="enable_background_audio">Odtwarzaj w tle</string>
+    <string name="video">Video</string>
+    <string name="audio">Audio</string>
+    <string name="text">Tekst</string>
+    <string name="logging">Logowanie</string>
+    <string name="logging_normal">Normalny</string>
+    <string name="logging_verbose">Szczegółowy</string>
+    <string name="retry">Ponów</string>
+    <string name="off">[wył]</string>
+    <string name="error_drm_not_supported">Zabezpieczona zawartość nie jest wspierana w poziomach API mniejszych od 18</string>
+    <string name="error_drm_unsupported_scheme">To urządzenie nie wspiera wymaganego schematu DRM</string>
+    <string name="error_drm_unknown">Wystąpił nieznany błąd DRM</string>
+    <string name="storage_permission_denied">Pozwolenie dostępu do pamięci zostało zabronione</string>
+    <string name="use_exoplayer_title">Użyj ExoPlayer</string>
+    <string name="use_exoplayer_summary">Experymentalne</string>
+
+    <string name="pause">Pauza</string>
+    <string name="view">Widok</string>
+    <string name="delete">Usuń</string>
+    <string name="checksum">Suma kontrolna</string>
+
+    <string name="add">Nowa misja</string>
+    <string name="finish">OK</string>
+    <string name="switch_mode">Przełącz pomiędzy listą, a siatką</string>
+
+
+    <string name="msg_url">URL pobierania</string>
+    <string name="msg_name">Nazwa pliku</string>
+    <string name="msg_threads">Wątki</string>
+    <string name="msg_fetch_filename">Wydobądź nazwę pliku</string>
+    <string name="msg_error">Błąd</string>
+    <string name="msg_server_unsupported">Serwer niewspierany</string>
+    <string name="msg_exists">Plik już istnieje</string>
+    <string name="msg_url_malform">Zniekształcony URL lub brak internetu</string>
+    <string name="msg_running">Pobieranie NewPipe</string>
+    <string name="msg_running_detail">Dotknij dla szczegółów</string>
+    <string name="msg_wait">Proszę czekać...</string>
+    <string name="msg_copied">Skopiowano do schowka.</string>
+    <string name="no_available_dir">Proszę wybrać dostępny katalog pobierania.</string>
+
+    </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 70002a1b3..19c98a924 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -63,8 +63,8 @@
     <string name="use_tor_title">Utilizar Tor</string>
     <string name="use_tor_summary">(Experimental) Utilizar a rede Tor para ter mais privacidade (ainda não é suportada a emissão de vídeos).</string>
 <string name="download_path_audio_title">Descarga de áudio</string>
-    <string name="download_path_audio_summary">Local para guardar o áudio descarregado</string>
-    <string name="download_path_audio_dialog_title">Digite o caminho para os arquivos de áudio.</string>
+    <string name="download_path_audio_summary">Local para guardar o áudio descarregado.</string>
+    <string name="download_path_audio_dialog_title">Digite o caminho para os ficheiros de áudio.</string>
 
     <string name="err_dir_create">Não foi possível criar o diretório \'%1$s\'</string>
     <string name="info_dir_created">Diretório \'%1$s\' criado com sucesso</string>
@@ -123,34 +123,34 @@
     <string name="report_error">Reportar um erro</string>
     <string name="user_report">Relatório</string>
 
-    <string name="downloads">Downloads</string>
-    <string name="downloads_title">Downloads</string>
-    <string name="settings_title">Configurações</string>
+    <string name="downloads">Descargas</string>
+    <string name="downloads_title">Descargas</string>
+    <string name="settings_title">Definições</string>
     <string name="error_report_title">Relatório de erro</string>
 
-    <string name="start">Início</string>
+    <string name="start">Iniciar</string>
     <string name="pause">Pausa</string>
-    <string name="view">Visualizar</string>
-    <string name="delete">Deletar</string>
-    <string name="checksum">Soma de verificação</string>
+    <string name="view">Ver</string>
+    <string name="delete">Apagar</string>
+    <string name="checksum">Checksum</string>
 
     <string name="add">Nova missão</string>
-    <string name="switch_mode">Alternar entre lista e grade</string>
+    <string name="switch_mode">Alternar entre lista e grelha</string>
 
 
-    <string name="msg_name">Nome do arquivo</string>
+    <string name="msg_name">Nome do ficheiro</string>
     <string name="msg_error">Erro</string>
     <string name="msg_server_unsupported">Servidor não suportado</string>
-    <string name="msg_exists">Arquivo já existe</string>
+    <string name="msg_exists">Ficheiro já existe</string>
     <string name="msg_url_malform">URL deformada ou internet não disponível</string>
     <string name="msg_running_detail">Toque para detalhes</string>
     <string name="msg_wait">Por favor aguarde...</string>
     <string name="msg_copied">Copiado para a área de transferência.</string>
-    <string name="no_available_dir">Por favor selecione um diretório de download disponível.</string>
+    <string name="no_available_dir">Por favor selecione um diretório disponível.</string>
 
     <string name="finish">OK</string>
-    <string name="msg_url">URL de download</string>
+    <string name="msg_url">URL da descarga</string>
     <string name="msg_threads">Tópicos</string>
-    <string name="msg_fetch_filename">Buscar um nome de arquivo</string>
+    <string name="msg_fetch_filename">Obter nome de ficheiro</string>
     <string name="msg_running">Descarga NewPipe</string>
     </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1c8dca48f..ad1b50adf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -50,7 +50,7 @@
 
 
     <!-- You can also inherit from NNF_BaseTheme.Light -->
-    <style name="FilePickerTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
         <!-- Set these to match your theme -->
         <item name="colorPrimary">@color/light_youtube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>