use newerextractor

Merge pull request #2530 from TeamNewPipe/release_v0.17.1
Release v0.17.1
2026-01-14 02:32:40 +00:00 · 2019-08-22 11:39:32 +02:00 · 2019-08-22 11:21:06 +02:00 · 2019-08-21 14:35:39 +02:00 · 2019-08-21 14:35:39 +02:00 · 2019-08-21 14:35:39 +02:00
539 changed files with 38021 additions and 13702 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,42 +5,64 @@ PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!

 ## Crash reporting

-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
+send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+add a comment to it. You'll see exactly what is sent, the system is 100% transparent.

 ## Issue reporting/feature requests

-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
+hasn't been reported/requested before
 * Check whether your issue/feature is already fixed/implemented
 * Check if the issue still exists in the latest release/beta version
 * If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
 * We use English for development. Issues in other languages will be closed and ignored.
 * Please only add *one* issue at a time. Do not put multiple issues into one thread.
+* When reporting a bug please give us a context, and a description how to reproduce it.
+* Issues that only contain a generated bug report, but no description might be closed.

 ## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
+* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
+tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request,
+register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.

 ## Translation

-* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there with your GitHub account.
+* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
+with your GitHub account.

 ## Code contribution

 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
+* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+  libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform.
-* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You
+  may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
+  not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* When submitting changes, you confirm that your code is licensed under the terms of the
+  [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+  description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about submission, or clearly state that in the description of your PR.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
+  but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the
+  maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
+  the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
+  about submission, or clearly state that in the description of your PR.
 * Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
 * Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
 * Check if your submission can be build with the current fdroid build server setup.
+* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+  independent solutions.

 ## Communication

 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
-* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
+  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to
+  tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
+  tracker described above!
 * Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+liberapay: TeamNewPipe
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,2 +1,3 @@
 - [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
 - [ ] I checked if the issue/feature exists in the latest version.
+- [ ] I did use the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/) to paste bug reports.
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ android:
  components:
    # The BuildTools version used by NewPipe
    - tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3

    # The SDK version used to compile NewPipe
-    - android-27
+    - android-28

 before_install: 
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest

 licenses:
--- a/README.md
+++ b/README.md
@@ -1,74 +1,100 @@
-<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"/></a></p> 
+<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
-<h4 align="center">A free lightweight YouTube frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"/></a></p> 
+<h4 align="center">A libre lightweight streaming frontend for Android.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 

 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPL v3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg" /></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg" /></a>
-<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg" /></a>
-<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"/></a>
+<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
-<hr />
-<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<hr>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#updates">Updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
-<hr />
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+<hr>
+
+<b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
+
+<b>PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.</b>

 ## Screenshots

-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)

 ## Description

-NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.

 ### Features

 * Search videos
-* Display general information about a video
+* Display general info about videos
 * Watch YouTube videos
 * Listen to YouTube videos
 * Popup mode (floating player)
-* Select the streaming player to watch the video with
-* Download videos 
+* Select streaming player to watch video with
+* Download videos
 * Download audio only
 * Open a video in Kodi
-* Show Next/Related videos
+* Show next/related videos
 * Search YouTube in a specific language
 * Watch/Block age restricted material
-* Display general information about channels
+* Display general info about channels
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
-* 1080p/2k/4k support
+* 1080p/2K/4K support
 * View history
 * Subscribe to channels
 * Search history
-* Search/Watch Playlists
-* Watch as queues Playlists
-* Queuing videos
+* Search/watch playlists
+* Watch as enqueued playlists
+* Enqueue videos
 * Local playlists
 * Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Livestream support
+* Show comments

 ### Coming Features

-* Livestream support
 * Cast to UPnP and Cast
-* Show comments
-* ... and many more
+* … and many more
+
+### Supported Services
+
+NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/documentation/) provide more info on how a new service can be added to the app and the extractor. Please get in touch with us if you intend to add a new one. Currently supported services are:
+
+* YouTube
+* SoundCloud \[beta\]
+* media.ccc.de \[beta\]
+
+## Updates
+When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
+ * Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
+ * Download the APK from [releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+ * Update via F-droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
+
+When you install an APK from one of these options, it will be incompatible with an APK from one of the other options. This is due to different signing keys being used. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app, and are independent. F-Droid and GitHub use different signing keys, and building an APK debug excludes a key. The signing key issue is being discussed in issue [#1981](https://github.com/TeamNewPipe/NewPipe/issues/1981), and may be fixed by setting up our own repository on F-Droid.
+
+In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality was broken and F-Droid doesn't have the update yet), we recommend following this procedure:
+1. Back up your data via "Settings>Content>Export Database" so you keep your history, subscriptions, and playlists
+2. Uninstall NewPipe
+3. Download the APK from the new source and install it
+4. Import the data from step 1 via "Settings>Content>Import Database"

 ## Contribution
 Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
@@ -77,26 +103,31 @@ The more is done the better it gets!
 If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).

 ## Donate
-If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin, Bountysource or Liberapay. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
+If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).

 <table>
  <tr>
-    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin" /></td>
-    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"/></td>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
  </tr>
  <tr>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" /></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"/></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px" /></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
  </tr>
  <tr>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px" /></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"/></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn." /></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
  </tr>
 </table>

+## Privacy Policy
+
+The NewPipe project aims to provide a private, anonymous experience for using media web services.
+Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or comment in our blog. You can find the document [here](https://newpipe.schabi.org/legal/privacy/).
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,28 +1,29 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'

    defaultConfig {
        applicationId "org.schabi.newpipe"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 61
-        versionName "0.13.2"
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 760
+        versionName "0.17.1"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
+
    buildTypes {
        release {
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
+
        debug {
            multiDexEnabled true
-
            debuggable true
            applicationIdSuffix ".debug"
        }
@@ -34,6 +35,7 @@ android {
        // but continue the build even when errors are found:
        abortOnError false
    }
+
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
@@ -41,60 +43,61 @@ android {
 }

 ext {
-    supportLibVersion = '27.1.0'
-    exoPlayerLibVersion = '2.7.3'
-    roomDbLibVersion = '1.0.0'
-    leakCanaryLibVersion = '1.5.4'
-    okHttpLibVersion = '1.5.0'
+    supportLibVersion = '28.0.0'
+    exoPlayerLibVersion = '2.9.6'
+    roomDbLibVersion = '1.1.1'
+    leakCanaryLibVersion = '1.5.4' //1.6.1
+    okHttpLibVersion = '3.12.1'
    icepickLibVersion = '3.2.0'
    stethoLibVersion = '1.5.0'
 }
+
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
        exclude module: 'support-annotations'
-    }
-
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:77a74b8'
+    })

+    implementation 'com.github.teamnewpipe:NewPipeExtractor:cfc72d8dc9d'

    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.23.0'

-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-v4:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'

-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra:4.9.2' //4.11

    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
    implementation 'de.hdodenhof:circleimageview:2.2.0'
    implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
    implementation 'com.nononsenseapps:filepicker:4.2.1'

-    implementation "com.google.android.exoplayer:exoplayer:$exoPlayerLibVersion"
-    implementation "com.google.android.exoplayer:extension-mediasession:$exoPlayerLibVersion"
+    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"

-    debugImplementation "com.facebook.stetho:stetho:$stethoLibVersion"
-    debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion"
+    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
    debugImplementation 'com.android.support:multidex:1.0.3'

-    implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'

-    implementation "android.arch.persistence.room:runtime:$roomDbLibVersion"
-    implementation "android.arch.persistence.room:rxjava2:$roomDbLibVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$roomDbLibVersion"
+    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"

-    implementation "frankiesardo:icepick:$icepickLibVersion"
-    annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion"
+    implementation "frankiesardo:icepick:${icepickLibVersion}"
+    annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"

-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"

-    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:$okHttpLibVersion"
+    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -42,3 +42,9 @@
 -dontwarn javax.annotation.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}
--- a/app/src/androidTest/java/org/schabi/newpipe/ApplicationTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/ApplicationTest.java
@@ -1,13 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <application
        android:name=".App"
@@ -34,12 +35,6 @@
            </intent-filter>
        </receiver>

-        <activity
-            android:name=".player.old.PlayVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/OldVideoPlayerTheme"
-            tools:ignore="UnusedAttribute"/>
-
        <service
            android:name=".player.BackgroundPlayer"
            android:exported="false">
@@ -76,12 +71,8 @@
            android:name=".about.AboutActivity"
            android:label="@string/title_activity_about"/>

-        <activity
-            android:name=".history.HistoryActivity"
-            android:label="@string/title_activity_history"/>
-
-        <service android:name=".subscription.services.SubscriptionsImportService"/>
-        <service android:name=".subscription.services.SubscriptionsExportService"/>
+        <service android:name=".local.subscription.services.SubscriptionsImportService"/>
+        <service android:name=".local.subscription.services.SubscriptionsExportService"/>

        <activity
            android:name=".PanicResponderActivity"
@@ -186,6 +177,19 @@
                <category android:name="android.intent.category.DEFAULT"/>
                <category android:name="android.intent.category.BROWSABLE"/>

+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="www.youtube-nocookie.com"/>
+                <data android:pathPrefix="/embed/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
                <data android:scheme="vnd.youtube"/>
                <data android:scheme="vnd.youtube.launch"/>
            </intent-filter>
@@ -212,6 +216,29 @@
                <data android:pathPrefix="/user/"/>
            </intent-filter>

+            <!-- Invidious filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="invidio.us"/>
+                <data android:host="www.invidio.us"/>
+                <!-- video prefix -->
+                <data android:pathPrefix="/embed/"/>
+                <data android:pathPrefix="/watch"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+                <!-- playlist prefix -->
+                <data android:pathPrefix="/playlist"/>
+            </intent-filter>
+
            <!-- Soundcloud filter -->
            <intent-filter>
                <action android:name="android.intent.action.VIEW"/>
@@ -241,4 +268,4 @@
            android:name=".RouterActivity$FetcherService"
            android:exported="false"/>
    </application>
-</manifest>
+</manifest>
--- a/app/src/main/java/android/support/design/widget/FlingBehavior.java
+++ b/app/src/main/java/android/support/design/widget/FlingBehavior.java
@@ -0,0 +1,116 @@
+package android.support.design.widget;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.animation.AnimationUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+// check this https://github.com/ToDou/appbarlayout-spring-behavior/blob/master/appbarspring/src/main/java/android/support/design/widget/AppBarFlingFixBehavior.java
+public final class FlingBehavior extends AppBarLayout.Behavior {
+
+    private ValueAnimator mOffsetAnimator;
+    private static final int MAX_OFFSET_ANIMATION_DURATION = 600; // ms
+
+    public FlingBehavior() {
+    }
+
+    public FlingBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dx, int dy, int[] consumed, int type) {
+        if (dy != 0) {
+            int val = child.getBottom();
+            if (val != 0) {
+                int min, max;
+                if (dy < 0) {
+                    // We're scrolling down
+                } else {
+                    // We're scrolling up
+                    if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+                        mOffsetAnimator.cancel();
+                    }
+                    min = -child.getUpNestedPreScrollRange();
+                    max = 0;
+                    consumed[1] = scroll(coordinatorLayout, child, dy, min, max);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean onNestedPreFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout child, @NonNull View target, float velocityX, float velocityY) {
+
+        if (velocityY != 0) {
+            if (velocityY < 0) {
+                // We're flinging down
+                int val = child.getBottom();
+                if (val != 0) {
+                    final int targetScroll =
+                            +child.getDownNestedPreScrollRange();
+                    animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+                }
+
+            } else {
+                // We're flinging up
+                int val = child.getBottom();
+                if (val != 0) {
+                    final int targetScroll = -child.getUpNestedPreScrollRange();
+                    if (getTopBottomOffsetForScrollingSibling() > targetScroll) {
+                        animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+                    }
+                }
+            }
+        }
+
+        return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY);
+    }
+
+    private void animateOffsetTo(final CoordinatorLayout coordinatorLayout,
+                                 final AppBarLayout child, final int offset, float velocity) {
+        final int distance = Math.abs(getTopBottomOffsetForScrollingSibling() - offset);
+
+        final int duration;
+        velocity = Math.abs(velocity);
+        if (velocity > 0) {
+            duration = 3 * Math.round(1000 * (distance / velocity));
+        } else {
+            final float distanceRatio = (float) distance / child.getHeight();
+            duration = (int) ((distanceRatio + 1) * 150);
+        }
+
+        animateOffsetWithDuration(coordinatorLayout, child, offset, duration);
+    }
+
+    private void animateOffsetWithDuration(final CoordinatorLayout coordinatorLayout,
+                                           final AppBarLayout child, final int offset, final int duration) {
+        final int currentOffset = getTopBottomOffsetForScrollingSibling();
+        if (currentOffset == offset) {
+            if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+                mOffsetAnimator.cancel();
+            }
+            return;
+        }
+
+        if (mOffsetAnimator == null) {
+            mOffsetAnimator = new ValueAnimator();
+            mOffsetAnimator.setInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
+            mOffsetAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator animator) {
+                    setHeaderTopBottomOffset(coordinatorLayout, child,
+                            (Integer) animator.getAnimatedValue());
+                }
+            });
+        } else {
+            mOffsetAnimator.cancel();
+        }
+
+        mOffsetAnimator.setDuration(Math.min(duration, MAX_OFFSET_ANIMATION_DURATION));
+        mOffsetAnimator.setIntValues(currentOffset, offset);
+        mOffsetAnimator.start();
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe;

+import android.annotation.TargetApi;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.util.Log;

@@ -21,6 +23,7 @@ import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
@@ -63,9 +66,11 @@ import io.reactivex.plugins.RxJavaPlugins;
 public class App extends Application {
    protected static final String TAG = App.class.toString();
    private RefWatcher refWatcher;
+    private static App app;

    @SuppressWarnings("unchecked")
-    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+    private static final Class<? extends ReportSenderFactory>[]
+            reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};

    @Override
    protected void attachBaseContext(Context base) {
@@ -85,10 +90,13 @@ public class App extends Application {
        }
        refWatcher = installLeakCanary();

+        app = this;
+
        // Initialize settings first because others inits can use its values
        SettingsActivity.initSettings(this);

-        NewPipe.init(getDownloader());
+        NewPipe.init(getDownloader(),
+                org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
        StateSaver.init(this);
        initNotificationChannel();

@@ -96,6 +104,9 @@ public class App extends Application {
        ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));

        configureRxJavaErrorHandler();
+
+        // Check for new version
+        new CheckForNewAppVersionTask().execute();
    }

    protected Downloader getDownloader() {
@@ -106,7 +117,7 @@ public class App extends Application {
        // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
        RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
+            public void accept(@NonNull Throwable throwable) {
                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
                        "throwable = [" + throwable.getClass().getName() + "]");

@@ -180,7 +191,11 @@ public class App extends Application {
            ACRA.init(this, acraConfig);
        } catch (ACRAConfigurationException ace) {
            ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+            ErrorActivity.reportError(this,
+                    ace,
+                    null,
+                    null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                    "Could not initialize ACRA crash report", R.string.app_ui_crash));
        }
    }
@@ -200,8 +215,34 @@ public class App extends Application {
        NotificationChannel mChannel = new NotificationChannel(id, name, importance);
        mChannel.setDescription(description);

-        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager mNotificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
        mNotificationManager.createNotificationChannel(mChannel);
+
+        setUpUpdateNotificationChannel(importance);
+    }
+
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
    }

    @Nullable
@@ -217,4 +258,8 @@ public class App extends Application {
    protected boolean isDisposedRxExceptionsReported() {
        return false;
    }
+
+    public static App getApp() {
+        return app;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -12,14 +13,24 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.leakcanary.RefWatcher;

 import icepick.Icepick;
+import icepick.State;

 public abstract class BaseFragment extends Fragment {
    protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;

    protected AppCompatActivity activity;
    public static final ImageLoader imageLoader = ImageLoader.getInstance();

+    //These values are used for controlling framgents when they are part of the frontpage
+    @State
+    protected boolean useAsFrontPage = false;
+    protected boolean mIsVisibleToUser = false;
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Fragment's Lifecycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -72,6 +83,12 @@ public abstract class BaseFragment extends Fragment {
        if (refWatcher != null) refWatcher.watch(this);
    }

+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Init
    //////////////////////////////////////////////////////////////////////////*/
@@ -88,8 +105,15 @@ public abstract class BaseFragment extends Fragment {

    public void setTitle(String title) {
        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
-        if (activity != null && activity.getSupportActionBar() != null) {
+        if((!useAsFrontPage || mIsVisibleToUser)
+            && (activity != null && activity.getSupportActionBar() != null)) {
            activity.getSupportActionBar().setTitle(title);
        }
    }
+
+    protected FragmentManager getFM() {
+        return getParentFragment() == null
+                ? getFragmentManager()
+                : getParentFragment().getFragmentManager();
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
+++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
@@ -0,0 +1,243 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.net.ConnectivityManager;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
+ * If there is a newer version we show a notification, informing the user. On tapping
+ * the notification, the user will be directed to the download link.
+ */
+public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
+
+    private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final String TAG = CheckForNewAppVersionTask.class.getSimpleName();
+    private static final Application app = App.getApp();
+    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private static final int timeoutPeriod = 30;
+
+    private SharedPreferences mPrefs;
+    private OkHttpClient client;
+
+    @Override
+    protected void onPreExecute() {
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        // Check if user has enabled/ disabled update checking
+        // and if the current apk is a github one or not.
+        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
+                || !isGithubApk()) {
+            this.cancel(true);
+        }
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+        
+        if(isCancelled() || !isConnected()) return null;
+
+        // Make a network request to get latest NewPipe data.
+        if (client == null) {
+
+            client = new OkHttpClient
+                    .Builder()
+                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
+                    .build();
+        }
+
+        Request request = new Request.Builder()
+                .url(newPipeApiUrl)
+                .build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException ex) {
+            // connectivity problems, do not alarm user and fail silently
+            if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        // Parse the json from the response.
+        if (response != null) {
+
+            try {
+                JSONObject mainObject = new JSONObject(response);
+                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                JSONObject githubObject = flavoursObject.getJSONObject("github");
+                JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                String versionName = githubStableObject.getString("version");
+                String versionCode = githubStableObject.getString("version_code");
+                String apkLocationUrl = githubStableObject.getString("apk");
+
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
+
+            } catch (JSONException ex) {
+                // connectivity problems, do not alarm user and fail silently
+                if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
+            }
+        }
+    }
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     * @param versionName
+     * @param apkLocationUrl
+     */
+    private void compareAppVersionAndShowNotification(String versionName,
+                                                      String apkLocationUrl,
+                                                      String versionCode) {
+
+        int NOTIFICATION_ID = 2000;
+
+        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
+
+            // A pending intent to open the apk location url in the browser.
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            PendingIntent pendingIntent
+                    = PendingIntent.getActivity(app, 0, intent, 0);
+
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat
+                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+                    .setContentText(app.getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
+            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
+        }
+    }
+
+    /**
+     * Method to get the apk's SHA1 key.
+     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
+     */
+    private static String getCertificateSHA1Fingerprint() {
+
+        PackageManager pm = app.getPackageManager();
+        String packageName = app.getPackageName();
+        int flags = PackageManager.GET_SIGNATURES;
+        PackageInfo packageInfo = null;
+
+        try {
+            packageInfo = pm.getPackageInfo(packageName, flags);
+        } catch (PackageManager.NameNotFoundException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
+        }
+
+        Signature[] signatures = packageInfo.signatures;
+        byte[] cert = signatures[0].toByteArray();
+        InputStream input = new ByteArrayInputStream(cert);
+
+        CertificateFactory cf = null;
+        X509Certificate c = null;
+
+        try {
+            cf = CertificateFactory.getInstance("X509");
+            c = (X509Certificate) cf.generateCertificate(input);
+        } catch (CertificateException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
+        }
+
+        String hexString = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(c.getEncoded());
+            hexString = byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException ex1) {
+            ErrorActivity.reportError(app, ex1, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        } catch (CertificateEncodingException ex2) {
+            ErrorActivity.reportError(app, ex2, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        }
+
+        return hexString;
+    }
+
+    private static String byte2HexFormatted(byte[] arr) {
+
+        StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            int l = h.length();
+            if (l == 1) h = "0" + h;
+            if (l > 2) h = h.substring(l - 2, l);
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) str.append(':');
+        }
+        return str.toString();
+    }
+
+    public static boolean isGithubApk() {
+
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+    }
+    
+    private boolean isConnected() {
+     
+        ConnectivityManager cm = 
+                (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
+        return cm.getActiveNetworkInfo() != null
+				&& cm.getActiveNetworkInfo().isConnected();
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -3,17 +3,24 @@ package org.schabi.newpipe;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;

+import org.schabi.newpipe.extractor.DownloadRequest;
+import org.schabi.newpipe.extractor.DownloadResponse;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.utils.Localization;

 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;

@@ -43,7 +50,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {

    private static Downloader instance;
    private String mCookies;
-    private OkHttpClient client;
+    private final OkHttpClient client;

    private Downloader(OkHttpClient.Builder builder) {
        this.client = builder
@@ -88,7 +95,8 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                    .build();
            response = client.newCall(request).execute();

-            return Long.parseLong(response.header("Content-Length"));
+            String contentLength = response.header("Content-Length");
+            return contentLength == null ? -1 : Long.parseLong(contentLength);
        } catch (NumberFormatException e) {
            throw new IOException("Invalid content length", e);
        } finally {
@@ -103,13 +111,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
     * but set the HTTP header field "Accept-Language" to the supplied string.
     *
     * @param siteUrl  the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @param localization the language and country (usually a 2-character code) to set
     * @return the contents of the specified text file
     */
    @Override
-    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+    public String download(String siteUrl, Localization localization) throws IOException, ReCaptchaException {
        Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", language);
+        requestProperties.put("Accept-Language", localization.getLanguage());
        return download(siteUrl, requestProperties);
    }

@@ -137,13 +145,16 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {

    private ResponseBody getBody(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
        final Request.Builder requestBuilder = new Request.Builder()
-                .method("GET", null).url(siteUrl)
-                .addHeader("User-Agent", USER_AGENT);
+                .method("GET", null).url(siteUrl);

        for (Map.Entry<String, String> header : customProperties.entrySet()) {
            requestBuilder.addHeader(header.getKey(), header.getValue());
        }

+        if (!customProperties.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
        if (!TextUtils.isEmpty(mCookies)) {
            requestBuilder.addHeader("Cookie", mCookies);
        }
@@ -153,7 +164,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
        final ResponseBody body = response.body();

        if (response.code() == 429) {
-            throw new ReCaptchaException("reCaptcha Challenge requested");
+            throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
        }

        if (body == null) {
@@ -175,4 +186,96 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
    public String download(String siteUrl) throws IOException, ReCaptchaException {
        return download(siteUrl, Collections.emptyMap());
    }
-}
+
+
+    @Override
+    public DownloadResponse get(String siteUrl, DownloadRequest request) throws IOException, ReCaptchaException {
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("GET", null).url(siteUrl);
+
+        Map<String, List<String>> requestHeaders = request.getRequestHeaders();
+        // set custom headers in request
+        for (Map.Entry<String, List<String>> pair : requestHeaders.entrySet()) {
+            for(String value : pair.getValue()){
+                requestBuilder.addHeader(pair.getKey(), value);
+            }
+        }
+
+        if (!requestHeaders.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request okRequest = requestBuilder.build();
+        final Response response = client.newCall(okRequest).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return new DownloadResponse(body.string(), response.headers().toMultimap());
+    }
+
+    @Override
+    public DownloadResponse get(String siteUrl) throws IOException, ReCaptchaException {
+        return get(siteUrl, DownloadRequest.emptyRequest);
+    }
+
+    @Override
+    public DownloadResponse post(String siteUrl, DownloadRequest request) throws IOException, ReCaptchaException {
+
+        Map<String, List<String>> requestHeaders = request.getRequestHeaders();
+        if(null == requestHeaders.get("Content-Type") || requestHeaders.get("Content-Type").isEmpty()){
+            // content type header is required. maybe throw an exception here
+            return null;
+        }
+
+        String contentType = requestHeaders.get("Content-Type").get(0);
+
+        RequestBody okRequestBody = null;
+        if(null != request.getRequestBody()){
+            okRequestBody = RequestBody.create(MediaType.parse(contentType), request.getRequestBody());
+        }
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("POST",  okRequestBody).url(siteUrl);
+
+        // set custom headers in request
+        for (Map.Entry<String, List<String>> pair : requestHeaders.entrySet()) {
+            for(String value : pair.getValue()){
+                requestBuilder.addHeader(pair.getKey(), value);
+            }
+        }
+
+        if (!requestHeaders.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request okRequest = requestBuilder.build();
+        final Response response = client.newCall(okRequest).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return new DownloadResponse(body.string(), response.headers().toMultimap());
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -23,7 +23,7 @@ package org.schabi.newpipe;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -43,18 +43,22 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;

 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ServiceHelper;
@@ -70,6 +74,19 @@ public class MainActivity extends AppCompatActivity {
    private NavigationView drawerItems = null;
    private TextView headerServiceView = null;

+    private boolean servicesShown = false;
+    private ImageView serviceArrow;
+
+    private static final int ITEM_ID_SUBSCRIPTIONS = - 1;
+    private static final int ITEM_ID_FEED = - 2;
+    private static final int ITEM_ID_BOOKMARKS = - 3;
+    private static final int ITEM_ID_DOWNLOADS = - 4;
+    private static final int ITEM_ID_HISTORY = - 5;
+    private static final int ITEM_ID_SETTINGS = 0;
+    private static final int ITEM_ID_ABOUT = 1;
+
+    private static final int ORDER = 0;
+
    /*//////////////////////////////////////////////////////////////////////////
    // Activity's LifeCycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -83,28 +100,64 @@ public class MainActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window w = getWindow();
+            w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
        if (getSupportFragmentManager() != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
            initFragments();
        }

        setSupportActionBar(findViewById(R.id.toolbar));
-        setupDrawer();
+        try {
+            setupDrawer();
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
    }

-    private void setupDrawer() {
+    private void setupDrawer() throws Exception {
        final Toolbar toolbar = findViewById(R.id.toolbar);
        drawer = findViewById(R.id.drawer_layout);
        drawerItems = findViewById(R.id.navigation);

-        for(StreamingService s : NewPipe.getServices()) {
-            final String title = s.getServiceInfo().getName() +
-                    (ServiceHelper.isBeta(s) ? " (beta)" : "");
-            final MenuItem item = drawerItems.getMenu()
-                    .add(R.id.menu_services_group, s.getServiceId(), 0, title);
-            item.setIcon(ServiceHelper.getIcon(s.getServiceId()));
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
        }

-        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));

        toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
        toggle.syncState();
@@ -119,52 +172,179 @@ public class MainActivity extends AppCompatActivity {

            @Override
            public void onDrawerClosed(View drawerView) {
+                if(servicesShown) {
+                    toggleServices();
+                }
                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
                    new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
                }
            }
        });

-        drawerItems.setNavigationItemSelectedListener(this::changeService);
-
-        setupDrawerFooter();
+        drawerItems.setNavigationItemSelectedListener(this::drawerItemSelected);
        setupDrawerHeader();
    }

-
-    private boolean changeService(MenuItem item) {
-        if (item.getGroupId() == R.id.menu_services_group) {
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
-            ServiceHelper.setSelectedServiceId(this, item.getItemId());
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
-        } else {
-            return false;
+    private boolean drawerItemSelected(MenuItem item) {
+        switch (item.getGroupId()) {
+            case R.id.menu_services_group:
+                changeService(item);
+                break;
+            case R.id.menu_tabs_group:
+                try {
+                    tabSelected(item);
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError(this, e);
+                }
+                break;
+            case R.id.menu_options_about_group:
+                optionsAboutSelected(item);
+                break;
+            default:
+                return false;
        }
+
        drawer.closeDrawers();
        return true;
    }

-    private void setupDrawerFooter() {
-        ImageButton settings = findViewById(R.id.drawer_settings);
-        ImageButton downloads = findViewById(R.id.drawer_downloads);
-        ImageButton history = findViewById(R.id.drawer_history);
+    private  void changeService(MenuItem item) {
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+        ServiceHelper.setSelectedServiceId(this, item.getItemId());
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }

-        settings.setOnClickListener(view -> NavigationHelper.openSettings(this));
-        downloads.setOnClickListener(view ->NavigationHelper.openDownloads(this));
-        history.setOnClickListener(view -> NavigationHelper.openHistory(this));
+    private void tabSelected(MenuItem item) throws ExtractionException {
+        switch(item.getItemId()) {
+            case ITEM_ID_SUBSCRIPTIONS:
+                NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_FEED:
+                NavigationHelper.openWhatsNewFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_BOOKMARKS:
+                NavigationHelper.openBookmarksFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_DOWNLOADS:
+                NavigationHelper.openDownloads(this);
+                break;
+            case ITEM_ID_HISTORY:
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                break;
+            default:
+                int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+                StreamingService service = NewPipe.getService(currentServiceId);
+                String serviceName = "";
+
+                int kioskId = 0;
+                for (final String ks : service.getKioskList().getAvailableKiosks()) {
+                    if(kioskId == item.getItemId()) {
+                        serviceName = ks;
+                    }
+                    kioskId ++;
+                }
+
+                NavigationHelper.openKioskFragment(getSupportFragmentManager(), currentServiceId, serviceName);
+                break;
+        }
+    }
+
+    private void optionsAboutSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case ITEM_ID_SETTINGS:
+                NavigationHelper.openSettings(this);
+                break;
+            case ITEM_ID_ABOUT:
+                NavigationHelper.openAbout(this);
+                break;
+        }
    }

    private void setupDrawerHeader() {
-        headerServiceView = findViewById(R.id.drawer_header_service_view);
-        Button action = findViewById(R.id.drawer_header_action_button);
+        NavigationView navigationView = findViewById(R.id.navigation);
+        View hView =  navigationView.getHeaderView(0);
+
+        serviceArrow = hView.findViewById(R.id.drawer_arrow);
+        headerServiceView = hView.findViewById(R.id.drawer_header_service_view);
+        Button action = hView.findViewById(R.id.drawer_header_action_button);
        action.setOnClickListener(view -> {
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse("https://newpipe.schabi.org/blog/"));
-            startActivity(intent);
-            drawer.closeDrawers();
+            toggleServices();
        });
    }

+    private void toggleServices() {
+        servicesShown = !servicesShown;
+
+        drawerItems.getMenu().removeGroup(R.id.menu_services_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_tabs_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_options_about_group);
+
+        if(servicesShown) {
+            showServices();
+        } else {
+            try {
+                showTabs();
+            } catch (Exception e) {
+                ErrorActivity.reportUiError(this, e);
+            }
+        }
+    }
+
+    private void showServices() {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_up_white);
+
+        for(StreamingService s : NewPipe.getServices()) {
+            final String title = s.getServiceInfo().getName() +
+                    (ServiceHelper.isBeta(s) ? " (beta)" : "");
+
+            drawerItems.getMenu()
+                    .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
+                    .setIcon(ServiceHelper.getIcon(s.getServiceId()));
+        }
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }
+
+    private void showTabs() throws ExtractionException {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_down_white);
+
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, ORDER, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
+        }
+
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
+    }
+
    @Override
    protected void onDestroy() {
        super.onDestroy();
@@ -327,17 +507,14 @@ public class MainActivity extends AppCompatActivity {
            case android.R.id.home:
                onHomeButtonPressed();
                return true;
-            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                return true;
            case R.id.action_show_downloads:
-                return NavigationHelper.openDownloads(this);
-            case R.id.action_about:
-                NavigationHelper.openAbout(this);
-                return true;
+                    return NavigationHelper.openDownloads(this);
            case R.id.action_history:
-                NavigationHelper.openHistory(this);
-                return true;
+                    NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                    return true;
+            case R.id.action_settings:
+                    NavigationHelper.openSettings(this);
+                    return true;
            default:
                return super.onOptionsItemSelected(item);
        }
@@ -381,31 +558,45 @@ public class MainActivity extends AppCompatActivity {
    }

    private void handleIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        try {
+            if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");

-        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
-            String url = intent.getStringExtra(Constants.KEY_URL);
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            String title = intent.getStringExtra(Constants.KEY_TITLE);
-            switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
-                case STREAM:
-                    boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
-                    break;
-                case CHANNEL:
-                    NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
-                case PLAYLIST:
-                    NavigationHelper.openPlaylistFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
+            if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+                String url = intent.getStringExtra(Constants.KEY_URL);
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                String title = intent.getStringExtra(Constants.KEY_TITLE);
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+                        NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                        break;
+                    case CHANNEL:
+                        NavigationHelper.openChannelFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                    case PLAYLIST:
+                        NavigationHelper.openPlaylistFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                }
+            } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
+                String searchString = intent.getStringExtra(Constants.KEY_SEARCH_STRING);
+                if (searchString == null) searchString = "";
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                NavigationHelper.openSearchFragment(
+                        getSupportFragmentManager(),
+                        serviceId,
+                        searchString);
+
+            } else {
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
            }
-        } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
-            String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
-            if (searchQuery == null) searchQuery = "";
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
-        } else {
-            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -37,15 +37,24 @@ import android.webkit.WebViewClient;
 */
 public class ReCaptchaActivity extends AppCompatActivity {
    public static final int RECAPTCHA_REQUEST = 10;
+    public static final String RECAPTCHA_URL_EXTRA = "recaptcha_url_extra";

    public static final String TAG = ReCaptchaActivity.class.toString();
    public static final String YT_URL = "https://www.youtube.com";

+    private String url;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_recaptcha);

+        url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA);
+        if (url == null || url.isEmpty()) {
+            url = YT_URL;
+        }
+
+
        // Set return to Cancel by default
        setResult(RESULT_CANCELED);

@@ -73,19 +82,16 @@ public class ReCaptchaActivity extends AppCompatActivity {
        myWebView.clearHistory();
        android.webkit.CookieManager cookieManager = CookieManager.getInstance();
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(new ValueCallback<Boolean>() {
-                @Override
-                public void onReceiveValue(Boolean aBoolean) {}
-            });
+            cookieManager.removeAllCookies(aBoolean -> {});
        } else {
            cookieManager.removeAllCookie();
        }

-        myWebView.loadUrl(YT_URL);
+        myWebView.loadUrl(url);
    }

    private class ReCaptchaWebViewClient extends WebViewClient {
-        private Activity context;
+        private final Activity context;
        private String mCookies;

        ReCaptchaWebViewClient(Activity ctx) {
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -1,13 +1,16 @@
 package org.schabi.newpipe;

+import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.AlertDialog;
@@ -23,6 +26,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;

+import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -31,13 +35,15 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.playlist.ChannelPlayQueue;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.PlaylistPlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -59,7 +65,8 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;

-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.*;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
 import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;

 /**
@@ -77,7 +84,12 @@ public class RouterActivity extends AppCompatActivity {
    protected int selectedPreviously = -1;

    protected String currentUrl;
-    protected CompositeDisposable disposables = new CompositeDisposable();
+    protected boolean internalRoute = false;
+    protected final CompositeDisposable disposables = new CompositeDisposable();
+
+    private boolean selectionIsDownload = false;
+
+    public static final String internalRouteKey = "internalRoute";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -88,14 +100,15 @@ public class RouterActivity extends AppCompatActivity {
            currentUrl = getUrl(getIntent());

            if (TextUtils.isEmpty(currentUrl)) {
-                Toast.makeText(this, R.string.invalid_url_toast, Toast.LENGTH_LONG).show();
+                handleText();
                finish();
            }
        }

+        internalRoute = getIntent().getBooleanExtra(internalRouteKey, false);
+
        setTheme(ThemeHelper.isLightThemeSelected(this)
-                ? R.style.RouterActivityThemeLight
-                : R.style.RouterActivityThemeDark);
+                ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
    }

    @Override
@@ -162,49 +175,72 @@ public class RouterActivity extends AppCompatActivity {

    protected void onSuccess() {
        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
-        boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
-
-        if ((isExtAudioEnabled || isExtVideoEnabled) && currentLinkType != LinkType.STREAM) {
-            Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.LENGTH_LONG).show();
-            finish();
-            return;
-        }
-
-        final String playerChoiceKey = preferences.getString(getString(R.string.preferred_open_action_key), getString(R.string.preferred_open_action_default));
+        final String selectedChoiceKey = preferences.getString(getString(R.string.preferred_open_action_key), getString(R.string.preferred_open_action_default));

+        final String showInfoKey = getString(R.string.show_info_key);
        final String videoPlayerKey = getString(R.string.video_player_key);
        final String backgroundPlayerKey = getString(R.string.background_player_key);
        final String popupPlayerKey = getString(R.string.popup_player_key);
+        final String downloadKey = getString(R.string.download_key);
        final String alwaysAskKey = getString(R.string.always_ask_open_action_key);

-        final List<StreamingService.ServiceInfo.MediaCapability> capabilities = currentService.getServiceInfo().getMediaCapabilities();
+        if (selectedChoiceKey.equals(alwaysAskKey)) {
+            final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);

-        boolean serviceSupportsPlayer = false;
-        if (playerChoiceKey.equals(videoPlayerKey) || playerChoiceKey.equals(popupPlayerKey)) {
-            serviceSupportsPlayer = capabilities.contains(VIDEO);
-        } else if (playerChoiceKey.equals(backgroundPlayerKey)) {
-            serviceSupportsPlayer = capabilities.contains(AUDIO);
-        }
-
-        if (playerChoiceKey.equals(alwaysAskKey) || !serviceSupportsPlayer) {
-            showDialog();
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
+            }
+        } else if (selectedChoiceKey.equals(showInfoKey)) {
+            handleChoice(showInfoKey);
+        } else if (selectedChoiceKey.equals(downloadKey)) {
+            handleChoice(downloadKey);
        } else {
-            handleChoice(playerChoiceKey);
+            final boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
+            final boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
+            final boolean isVideoPlayerSelected = selectedChoiceKey.equals(videoPlayerKey) || selectedChoiceKey.equals(popupPlayerKey);
+            final boolean isAudioPlayerSelected = selectedChoiceKey.equals(backgroundPlayerKey);
+
+            if (currentLinkType != LinkType.STREAM) {
+                if (isExtAudioEnabled && isAudioPlayerSelected || isExtVideoEnabled && isVideoPlayerSelected) {
+                    Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.LENGTH_LONG).show();
+                    handleChoice(showInfoKey);
+                    return;
+                }
+            }
+
+            final List<StreamingService.ServiceInfo.MediaCapability> capabilities = currentService.getServiceInfo().getMediaCapabilities();
+
+            boolean serviceSupportsChoice = false;
+            if (isVideoPlayerSelected) {
+                serviceSupportsChoice = capabilities.contains(VIDEO);
+            } else if (selectedChoiceKey.equals(backgroundPlayerKey)) {
+                serviceSupportsChoice = capabilities.contains(AUDIO);
+            }
+
+            if (serviceSupportsChoice) {
+                handleChoice(selectedChoiceKey);
+            } else {
+                handleChoice(showInfoKey);
+            }
        }
    }

-    private void showDialog() {
+    private void showDialog(final List<AdapterChoiceItem> choices) {
        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        final ContextThemeWrapper themeWrapperContext = new ContextThemeWrapper(this,
-                ThemeHelper.isLightThemeSelected(this) ? R.style.LightTheme : R.style.DarkTheme);
+        final Context themeWrapperContext = getThemeWrapperContext();

        final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
        final LinearLayout rootLayout = (LinearLayout) inflater.inflate(R.layout.preferred_player_dialog_view, null, false);
        final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);

-        final List<AdapterChoiceItem> choices = getChoicesForService(themeWrapperContext, currentService);
-
        final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
            final int indexOfChild = radioGroup.indexOfChild(
                    radioGroup.findViewById(radioGroup.getCheckedRadioButtonId()));
@@ -223,7 +259,9 @@ public class RouterActivity extends AppCompatActivity {
                .setCancelable(true)
                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                .setPositiveButton(R.string.always, dialogButtonsClickListener)
-                .setOnDismissListener((dialog) -> finish())
+                .setOnDismissListener((dialog) -> {
+                    if (!selectionIsDownload) finish();
+                })
                .create();

        //noinspection CodeBlock2Expr
@@ -278,28 +316,42 @@ public class RouterActivity extends AppCompatActivity {
        alertDialog.show();
    }

-    private List<AdapterChoiceItem> getChoicesForService(Context context, StreamingService service) {
+    private List<AdapterChoiceItem> getChoicesForService(StreamingService service, LinkType linkType) {
+        final Context context = getThemeWrapperContext();
+
        final List<AdapterChoiceItem> returnList = new ArrayList<>();
        final List<StreamingService.ServiceInfo.MediaCapability> capabilities = service.getServiceInfo().getMediaCapabilities();

+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
+        boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
+
        returnList.add(new AdapterChoiceItem(getString(R.string.show_info_key), getString(R.string.show_info),
                resolveResourceIdFromAttr(context, R.attr.info)));

-        if (capabilities.contains(VIDEO)) {
+        if (capabilities.contains(VIDEO) && !(isExtVideoEnabled && linkType != LinkType.STREAM)) {
            returnList.add(new AdapterChoiceItem(getString(R.string.video_player_key), getString(R.string.video_player),
                    resolveResourceIdFromAttr(context, R.attr.play)));
            returnList.add(new AdapterChoiceItem(getString(R.string.popup_player_key), getString(R.string.popup_player),
                    resolveResourceIdFromAttr(context, R.attr.popup)));
        }

-        if (capabilities.contains(AUDIO)) {
+        if (capabilities.contains(AUDIO) && !(isExtAudioEnabled && linkType != LinkType.STREAM)) {
            returnList.add(new AdapterChoiceItem(getString(R.string.background_player_key), getString(R.string.background_player),
                    resolveResourceIdFromAttr(context, R.attr.audio)));
        }

+        returnList.add(new AdapterChoiceItem(getString(R.string.download_key), getString(R.string.download),
+                resolveResourceIdFromAttr(context, R.attr.download)));
+
        return returnList;
    }

+    private Context getThemeWrapperContext() {
+        return new ContextThemeWrapper(this,
+                ThemeHelper.isLightThemeSelected(this) ? R.style.LightTheme : R.style.DarkTheme);
+    }
+
    private void setDialogButtonsState(AlertDialog dialog, boolean state) {
        final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
        final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
@@ -309,30 +361,49 @@ public class RouterActivity extends AppCompatActivity {
        positiveButton.setEnabled(state);
    }

-    private void handleChoice(final String playerChoiceKey) {
+    private void handleText() {
+        String searchString = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+        int serviceId = getIntent().getIntExtra(Constants.KEY_SERVICE_ID, 0);
+        Intent intent = new Intent(getThemeWrapperContext(), MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        NavigationHelper.openSearch(getThemeWrapperContext(), serviceId, searchString);
+    }
+
+    private void handleChoice(final String selectedChoiceKey) {
        final List<String> validChoicesList = Arrays.asList(getResources().getStringArray(R.array.preferred_open_action_values_list));
-        if (validChoicesList.contains(playerChoiceKey)) {
+        if (validChoicesList.contains(selectedChoiceKey)) {
            PreferenceManager.getDefaultSharedPreferences(this).edit()
-                    .putString(getString(R.string.preferred_open_action_last_selected_key), playerChoiceKey)
+                    .putString(getString(R.string.preferred_open_action_last_selected_key), selectedChoiceKey)
                    .apply();
        }

-        if (playerChoiceKey.equals(getString(R.string.popup_player_key)) && !PermissionHelper.isPopupEnabled(this)) {
+        if (selectedChoiceKey.equals(getString(R.string.popup_player_key)) && !PermissionHelper.isPopupEnabled(this)) {
            PermissionHelper.showPopupEnablementToast(this);
            finish();
            return;
        }

+        if (selectedChoiceKey.equals(getString(R.string.download_key))) {
+            if (PermissionHelper.checkStoragePermissions(this, PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
+                selectionIsDownload = true;
+                openDownloadDialog();
+            }
+            return;
+        }
+
        // stop and bypass FetcherService if InfoScreen was selected since
        // StreamDetailFragment can fetch data itself
-        if (playerChoiceKey.equals(getString(R.string.show_info_key))) {
+        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
            disposables.add(Observable
                    .fromCallable(() -> NavigationHelper.getIntentByLink(this, currentUrl))
                    .subscribeOn(Schedulers.io())
                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe(intent -> {
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        if (!internalRoute) {
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        }
                        startActivity(intent);

                        finish();
@@ -342,16 +413,58 @@ public class RouterActivity extends AppCompatActivity {
        }

        final Intent intent = new Intent(this, FetcherService.class);
-        final Choice choice = new Choice(currentService.getServiceId(), currentLinkType, currentUrl, playerChoiceKey);
+        final Choice choice = new Choice(currentService.getServiceId(), currentLinkType, currentUrl, selectedChoiceKey);
        intent.putExtra(FetcherService.KEY_CHOICE, choice);
        startService(intent);

        finish();
    }

+    @SuppressLint("CheckResult")
+    private void openDownloadDialog() {
+        ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@NonNull StreamInfo result) -> {
+                    List<VideoStream> sortedVideoStreams = ListHelper.getSortedStreamVideosList(this,
+                            result.getVideoStreams(),
+                            result.getVideoOnlyStreams(),
+                            false);
+                    int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
+                            sortedVideoStreams);
+
+                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
+                    downloadDialog.setVideoStreams(sortedVideoStreams);
+                    downloadDialog.setAudioStreams(result.getAudioStreams());
+                    downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                    downloadDialog.show(fm, "downloadDialog");
+                    fm.executePendingTransactions();
+                    downloadDialog.getDialog().setOnDismissListener(dialog -> {
+                        finish();
+                    });
+                }, (@NonNull Throwable throwable) -> {
+                    onError();
+                });
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i : grantResults) {
+            if (i == PackageManager.PERMISSION_DENIED) {
+                finish();
+                return;
+            }
+        }
+        if (requestCode == PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE) {
+            openDownloadDialog();
+        }
+    }
+
    private static class AdapterChoiceItem {
        final String description, key;
-        @DrawableRes final int icon;
+        @DrawableRes
+        final int icon;

        AdapterChoiceItem(String key, String description, int icon) {
            this.description = description;
@@ -450,7 +563,7 @@ public class RouterActivity extends AppCompatActivity {
                final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
                boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
-                boolean useOldVideoPlayer = PlayerHelper.isUsingOldPlayer(this);
+                ;

                PlayQueue playQueue;
                String playerChoice = choice.playerChoice;
@@ -462,14 +575,11 @@ public class RouterActivity extends AppCompatActivity {
                    } else if (playerChoice.equals(videoPlayerKey) && isExtVideoEnabled) {
                        NavigationHelper.playOnExternalVideoPlayer(this, (StreamInfo) info);

-                    } else if (playerChoice.equals(videoPlayerKey) && useOldVideoPlayer) {
-                        NavigationHelper.playOnOldVideoPlayer(this, (StreamInfo) info);
-
                    } else {
                        playQueue = new SinglePlayQueue((StreamInfo) info);

                        if (playerChoice.equals(videoPlayerKey)) {
-                            NavigationHelper.playOnMainPlayer(this, playQueue);
+                            NavigationHelper.playOnMainPlayer(this, playQueue, true);
                        } else if (playerChoice.equals(backgroundPlayerKey)) {
                            NavigationHelper.enqueueOnBackgroundPlayer(this, playQueue, true);
                        } else if (playerChoice.equals(popupPlayerKey)) {
@@ -482,11 +592,11 @@ public class RouterActivity extends AppCompatActivity {
                    playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);

                    if (playerChoice.equals(videoPlayerKey)) {
-                        NavigationHelper.playOnMainPlayer(this, playQueue);
+                        NavigationHelper.playOnMainPlayer(this, playQueue, true);
                    } else if (playerChoice.equals(backgroundPlayerKey)) {
-                        NavigationHelper.playOnBackgroundPlayer(this, playQueue);
+                        NavigationHelper.playOnBackgroundPlayer(this, playQueue, true);
                    } else if (playerChoice.equals(popupPlayerKey)) {
-                        NavigationHelper.playOnPopupPlayer(this, playQueue);
+                        NavigationHelper.playOnPopupPlayer(this, playQueue, true);
                    }
                }
            };
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -32,7 +32,6 @@ public class AboutActivity extends AppCompatActivity {
            new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
            new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
            new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Google Gson", "2008", "Google Inc", "https://github.com/google/gson", StandardLicenses.APACHE2),
            new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
            new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
@@ -129,47 +128,31 @@ public class AboutActivity extends AppCompatActivity {
        public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                 Bundle savedInstanceState) {
            View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            Context context = this.getContext();
+
            TextView version = rootView.findViewById(R.id.app_version);
            version.setText(BuildConfig.VERSION_NAME);

            View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+            githubLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.github_url), context));

            View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+            donationLink.setOnClickListener(v -> openWebsite(context.getString(R.string.donation_url), context));

            View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+            websiteLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.website_url), context));
+
+            View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
+            privacyPolicyLink.setOnClickListener(v -> openWebsite(context.getString(R.string.privacy_policy_url), context));

            return rootView;
        }

-        private static class OnGithubLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
-                context.startActivity(intent);
-            }
+        private void openWebsite(String url, Context context) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            context.startActivity(intent);
        }

-        private static class OnDonationLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_url)));
-                context.startActivity(intent);
-            }
-        }
-
-        private static class OnWebsiteLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.website_url)));
-                context.startActivity(intent);
-            }
-        }
    }


--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -39,7 +40,7 @@ public class LicenseFragment extends Fragment {
     * @param license the license to show
     */
    public static void showLicense(Context context, License license) {
-        new LicenseFragmentHelper().execute(context, license);
+        new LicenseFragmentHelper((Activity) context).execute(license);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
@@ -1,8 +1,10 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
@@ -10,26 +12,46 @@ import org.schabi.newpipe.util.ThemeHelper;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;

 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {

-    private Context context;
+    final WeakReference<Activity> weakReference;
    private License license;

+    public LicenseFragmentHelper(@Nullable Activity activity) {
+        weakReference = new WeakReference<>(activity);
+    }
+
+    @Nullable
+    private Activity getActivity() {
+        Activity activity = weakReference.get();
+
+        if (activity != null && activity.isFinishing()) {
+            return null;
+        } else {
+            return activity;
+        }
+    }
+
    @Override
    protected Integer doInBackground(Object... objects) {
-        context = (Context) objects[0];
-        license = (License) objects[1];
+        license = (License) objects[0];
        return 1;
    }

    @Override
-    protected void onPostExecute(Integer result){
-        String webViewData = getFormattedLicense(context, license);
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+    protected void onPostExecute(Integer result) {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        String webViewData = getFormattedLicense(activity, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
        alert.setTitle(license.getName());

-        WebView wv = new WebView(context);
+        WebView wv = new WebView(activity);
        wv.loadData(webViewData, "text/html; charset=UTF-8", null);

        alert.setView(wv);
@@ -55,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
            throw new NullPointerException("license is null");
        }

-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
        String webViewData;
        try {
            BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
            String str;
            while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
            }
            in.close();

            // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
            webViewData = insert[0] + "<style type=\"text/css\">"
                    + getLicenseStylesheet(context) + "</style></head>"
                    + insert[1];
--- a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
@@ -30,7 +30,7 @@ public interface BasicDAO<Entity> {

    /* Deletes */
    @Delete
-    int delete(final Entity entity);
+    void delete(final Entity entity);

    @Delete
    int delete(final Collection<Entity> entities);
@@ -42,5 +42,5 @@ public interface BasicDAO<Entity> {
    int update(final Entity entity);

    @Update
-    int update(final Collection<Entity> entities);
+    void update(final Collection<Entity> entities);
 }
--- a/app/src/main/java/org/schabi/newpipe/database/Migrations.java
+++ b/app/src/main/java/org/schabi/newpipe/database/Migrations.java
@@ -3,15 +3,24 @@ package org.schabi.newpipe.database;
 import android.arch.persistence.db.SupportSQLiteDatabase;
 import android.arch.persistence.room.migration.Migration;
 import android.support.annotation.NonNull;
+import android.util.Log;
+
+import org.schabi.newpipe.BuildConfig;

 public class Migrations {

    public static final int DB_VER_11_0 = 1;
    public static final int DB_VER_12_0 = 2;

+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
+    private static final String TAG = Migrations.class.getName();
+
    public static final Migration MIGRATION_11_12 = new Migration(DB_VER_11_0, DB_VER_12_0) {
        @Override
        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            if(DEBUG) {
+                Log.d(TAG, "Start migrating database");
+            }
            /*
            * Unfortunately these queries must be hardcoded due to the possibility of
            * schema and names changing at a later date, thus invalidating the older migration
@@ -56,6 +65,10 @@ public class Migrations {
                    "ORDER BY creation_date DESC");

            database.execSQL("DROP TABLE IF EXISTS watch_history");
+
+            if(DEBUG) {
+                Log.d(TAG, "Stop migrating database");
+            }
        }
    };
 }
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
@@ -4,7 +4,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;

-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;

 import java.util.List;
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
@@ -5,7 +5,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;

-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
@@ -51,6 +50,11 @@ public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity
            " ORDER BY " + STREAM_ACCESS_DATE + " DESC")
    public abstract Flowable<List<StreamHistoryEntry>> getHistory();

+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID +
+            " = :streamId ORDER BY " + STREAM_ACCESS_DATE + " DESC LIMIT 1")
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry(final long streamId);
+
    @Query("DELETE FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
    public abstract int deleteStreamHistory(final long streamId);

--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.dao;

 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;

 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
@@ -12,7 +11,6 @@ import java.util.List;
 import io.reactivex.Flowable;

 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;

@Dao
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
@@ -8,7 +8,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
-import org.schabi.newpipe.database.stream.model.StreamEntity;

 import java.util.List;

--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
@@ -5,8 +5,6 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;

-import java.util.Date;
-
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;

--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
@@ -6,7 +6,6 @@ import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;

-import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.util.Constants;
@@ -71,6 +70,14 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
                info.getUploaderName(), info.getStreamCount());
    }

+    @Ignore
+    public boolean isIdenticalTo(final PlaylistInfo info) {
+        return getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
+                getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
+                getThumbnailUrl().equals(info.getThumbnailUrl()) &&
+                getUploader().equals(info.getUploaderName());
+    }
+
    public long getUid() {
        return uid;
    }
--- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
@@ -10,7 +10,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
-import org.schabi.newpipe.database.stream.model.StreamStateEntity;

 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@ import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVI
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;

@Dao
 public abstract class StreamDAO implements BasicDAO<StreamEntity> {
--- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java
@@ -9,7 +9,7 @@ import android.arch.persistence.room.PrimaryKey;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
-import org.schabi.newpipe.playlist.PlayQueueItem;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.Constants;

 import java.io.Serializable;
--- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java
@@ -4,6 +4,9 @@ package org.schabi.newpipe.database.stream.model;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.Nullable;
+
+import java.util.concurrent.TimeUnit;

 import static android.arch.persistence.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
@@ -22,6 +25,12 @@ public class StreamStateEntity {
    final public static String JOIN_STREAM_ID       = "stream_id";
    final public static String STREAM_PROGRESS_TIME = "progress_time";

+
+    /** Playback state will not be saved, if playback time less than this threshold */
+    private static final int PLAYBACK_SAVE_THRESHOLD_START_SECONDS = 5;
+    /** Playback state will not be saved, if time left less than this threshold */
+    private static final int PLAYBACK_SAVE_THRESHOLD_END_SECONDS = 10;
+
    @ColumnInfo(name = JOIN_STREAM_ID)
    private long streamUid;

@@ -48,4 +57,18 @@ public class StreamStateEntity {
    public void setProgressTime(long progressTime) {
        this.progressTime = progressTime;
    }
+
+    public boolean isValid(int durationInSeconds) {
+        final int seconds = (int) TimeUnit.MILLISECONDS.toSeconds(progressTime);
+        return seconds > PLAYBACK_SAVE_THRESHOLD_START_SECONDS
+                && seconds < durationInSeconds - PLAYBACK_SAVE_THRESHOLD_END_SECONDS;
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj instanceof StreamStateEntity) {
+            return ((StreamStateEntity) obj).streamUid == streamUid
+                    && ((StreamStateEntity) obj).progressTime == progressTime;
+        } else return false;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -16,11 +16,12 @@ import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;

 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;

 public class DownloadActivity extends AppCompatActivity {

+    private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        // Service
@@ -42,25 +43,25 @@ public class DownloadActivity extends AppCompatActivity {
            actionBar.setDisplayShowTitleEnabled(true);
        }

-        // Fragment
        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
            @Override
            public void onGlobalLayout() {
                updateFragments();
-                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                getWindow().getDecorView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
            }
        });
    }

    private void updateFragments() {
+        MissionsFragment fragment = new MissionsFragment();

-        MissionsFragment fragment = new AllMissionsFragment();
-        getFragmentManager().beginTransaction()
-                .replace(R.id.frame, fragment)
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                .commit();
    }

+    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        super.onCreateOptionsMenu(menu);
        MenuInflater inflater = getMenuInflater();
@@ -86,5 +87,4 @@ public class DownloadActivity extends AppCompatActivity {
                return super.onOptionsItemSelected(item);
        }
    }
-
 }
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -1,13 +1,27 @@
 package org.schabi.newpipe.download;

+import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.provider.DocumentFile;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.view.menu.ActionMenuItemView;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,49 +34,82 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;

+import com.nononsenseapps.filepicker.Utils;
+
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.Localization;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;

+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Locale;

 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.io.StoredDirectoryHelper;
+import us.shandian.giga.io.StoredFileHelper;
+import us.shandian.giga.postprocessing.Postprocessing;
+import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
+import us.shandian.giga.service.MissionState;

 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
    private static final String TAG = "DialogFragment";
    private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230;

-    @State protected StreamInfo currentInfo;
-    @State protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
-    @State protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
-    @State protected int selectedVideoIndex = 0;
-    @State protected int selectedAudioIndex = 0;
+    @State
+    protected StreamInfo currentInfo;
+    @State
+    protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams = StreamSizeWrapper.empty();
+    @State
+    protected int selectedVideoIndex = 0;
+    @State
+    protected int selectedAudioIndex = 0;
+    @State
+    protected int selectedSubtitleIndex = 0;

-    private StreamItemAdapter<AudioStream> audioStreamsAdapter;
-    private StreamItemAdapter<VideoStream> videoStreamsAdapter;
+    private StreamItemAdapter<AudioStream, Stream> audioStreamsAdapter;
+    private StreamItemAdapter<VideoStream, AudioStream> videoStreamsAdapter;
+    private StreamItemAdapter<SubtitlesStream, Stream> subtitleStreamsAdapter;

-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();

    private EditText nameEditText;
    private Spinner streamsSpinner;
-    private RadioGroup radioVideoAudioGroup;
+    private RadioGroup radioStreamsGroup;
    private TextView threadsCountTextView;
    private SeekBar threadsSeekBar;

+    private SharedPreferences prefs;
+
    public static DownloadDialog newInstance(StreamInfo info) {
        DownloadDialog dialog = new DownloadDialog();
        dialog.setInfo(info);
@@ -78,6 +125,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        instance.setVideoStreams(streamsList);
        instance.setSelectedVideoStream(selectedStreamIndex);
        instance.setAudioStreams(info.getAudioStreams());
+        instance.setSubtitleStreams(info.getSubtitles());
+
        return instance;
    }

@@ -86,7 +135,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    public void setAudioStreams(List<AudioStream> audioStreams) {
-        setAudioStreams(new StreamSizeWrapper<>(audioStreams));
+        setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
    }

    public void setAudioStreams(StreamSizeWrapper<AudioStream> wrappedAudioStreams) {
@@ -94,13 +143,21 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    public void setVideoStreams(List<VideoStream> videoStreams) {
-        setVideoStreams(new StreamSizeWrapper<>(videoStreams));
+        setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
    }

    public void setVideoStreams(StreamSizeWrapper<VideoStream> wrappedVideoStreams) {
        this.wrappedVideoStreams = wrappedVideoStreams;
    }

+    public void setSubtitleStreams(List<SubtitlesStream> subtitleStreams) {
+        setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
+    }
+
+    public void setSubtitleStreams(StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams) {
+        this.wrappedSubtitleStreams = wrappedSubtitleStreams;
+    }
+
    public void setSelectedVideoStream(int selectedVideoIndex) {
        this.selectedVideoIndex = selectedVideoIndex;
    }
@@ -109,6 +166,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        this.selectedAudioIndex = selectedAudioIndex;
    }

+    public void setSelectedSubtitleStream(int selectedSubtitleIndex) {
+        this.selectedSubtitleIndex = selectedSubtitleIndex;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // LifeCycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -116,22 +177,66 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+
        if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
            getDialog().dismiss();
            return;
        }

-        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
+        context = getContext();
+
+        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
        Icepick.restoreInstanceState(this, savedInstanceState);

-        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, true);
-        this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
+        SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams = new SparseArray<>(4);
+        List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            if (!videoStreams.get(i).isVideoOnly()) continue;
+            AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
+
+            if (audioStream != null) {
+                secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+            } else if (DEBUG) {
+                Log.w(TAG, "No audio stream candidates for video format " + videoStreams.get(i).getFormat().name());
+            }
+        }
+
+        this.videoStreamsAdapter = new StreamItemAdapter<>(context, wrappedVideoStreams, secondaryStreams);
+        this.audioStreamsAdapter = new StreamItemAdapter<>(context, wrappedAudioStreams);
+        this.subtitleStreamsAdapter = new StreamItemAdapter<>(context, wrappedSubtitleStreams);
+
+        Intent intent = new Intent(context, DownloadManagerService.class);
+        context.startService(intent);
+
+        context.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName cname, IBinder service) {
+                DownloadManagerBinder mgr = (DownloadManagerBinder) service;
+
+                mainStorageAudio = mgr.getMainStorageAudio();
+                mainStorageVideo = mgr.getMainStorageVideo();
+                downloadManager = mgr.getDownloadManager();
+                askForSavePath = mgr.askForSavePath();
+
+                okButton.setEnabled(true);
+
+                context.unbindService(this);
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                // nothing to do
+            }
+        }, Context.BIND_AUTO_CREATE);
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
        return inflater.inflate(R.layout.download_dialog, container);
    }

@@ -142,26 +247,32 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
        selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());

+        selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
+
        streamsSpinner = view.findViewById(R.id.quality_spinner);
        streamsSpinner.setOnItemSelectedListener(this);

        threadsCountTextView = view.findViewById(R.id.threads_count);
        threadsSeekBar = view.findViewById(R.id.threads);

-        radioVideoAudioGroup = view.findViewById(R.id.video_audio_group);
-        radioVideoAudioGroup.setOnCheckedChangeListener(this);
+        radioStreamsGroup = view.findViewById(R.id.video_audio_group);
+        radioStreamsGroup.setOnCheckedChangeListener(this);

        initToolbar(view.findViewById(R.id.toolbar));
        setupDownloadOptions();

-        int def = 3;
-        threadsCountTextView.setText(String.valueOf(def));
-        threadsSeekBar.setProgress(def - 1);
+        prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+        int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
+        threadsCountTextView.setText(String.valueOf(threads));
+        threadsSeekBar.setProgress(threads - 1);
        threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

            @Override
            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-                threadsCountTextView.setText(String.valueOf(progress + 1));
+                progress++;
+                prefs.edit().putInt(getString(R.string.default_download_threads), progress).apply();
+                threadsCountTextView.setText(String.valueOf(progress));
            }

            @Override
@@ -180,15 +291,20 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        disposables.clear();

        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams).subscribe(result -> {
-            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.video_button) {
                setupVideoSpinner();
            }
        }));
        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams).subscribe(result -> {
-            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button) {
                setupAudioSpinner();
            }
        }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
+            if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+                setupSubtitleSpinner();
+            }
+        }));
    }

    @Override
@@ -198,25 +314,58 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
        super.onSaveInstanceState(outState);
        Icepick.saveInstanceState(this, outState);
    }

+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_DOWNLOAD_SAVE_AS && resultCode == Activity.RESULT_OK) {
+            if (data.getData() == null) {
+                showFailedDialog(R.string.general_error);
+                return;
+            }
+
+            if (FilePickerActivityHelper.isOwnFileUri(context, data.getData())) {
+                File file = Utils.getFileForUri(data.getData());
+                checkSelectedDownload(null, Uri.fromFile(file), file.getName(), StoredFileHelper.DEFAULT_MIME);
+                return;
+            }
+
+            DocumentFile docFile = DocumentFile.fromSingleUri(context, data.getData());
+            if (docFile == null) {
+                showFailedDialog(R.string.general_error);
+                return;
+            }
+
+            // check if the selected file was previously used
+            checkSelectedDownload(null, data.getData(), docFile.getName(), docFile.getType());
+        }
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Inits
    //////////////////////////////////////////////////////////////////////////*/

    private void initToolbar(Toolbar toolbar) {
        if (DEBUG) Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
+
+        boolean isLight = ThemeHelper.isLightThemeSelected(getActivity());
+
        toolbar.setTitle(R.string.download_dialog_title);
-        toolbar.setNavigationIcon(ThemeHelper.isLightThemeSelected(getActivity()) ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
+        toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
        toolbar.inflateMenu(R.menu.dialog_url);
        toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());

+        okButton = toolbar.findViewById(R.id.okay);
+        okButton.setEnabled(false);// disable until the download service connection is done
+
        toolbar.setOnMenuItemClickListener(item -> {
            if (item.getItemId() == R.id.okay) {
-                downloadSelected();
+                prepareSelectedDownload();
                return true;
            }
            return false;
@@ -239,13 +388,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        setRadioButtonsState(true);
    }

+    private void setupSubtitleSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(subtitleStreamsAdapter);
+        streamsSpinner.setSelection(selectedSubtitleIndex);
+        setRadioButtonsState(true);
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Radio group Video&Audio options - Listener
    //////////////////////////////////////////////////////////////////////////*/

    @Override
    public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
-        if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        boolean flag = true;
+
        switch (checkedId) {
            case R.id.audio_button:
                setupAudioSpinner();
@@ -253,7 +413,13 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
            case R.id.video_button:
                setupVideoSpinner();
                break;
+            case R.id.subtitle_button:
+                setupSubtitleSpinner();
+                flag = false;
+                break;
        }
+
+        threadsSeekBar.setEnabled(flag);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -262,14 +428,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck

    @Override
    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
-        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+        if (DEBUG)
+            Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
            case R.id.audio_button:
                selectedAudioIndex = position;
                break;
            case R.id.video_button:
                selectedVideoIndex = position;
                break;
+            case R.id.subtitle_button:
+                selectedSubtitleIndex = position;
+                break;
        }
    }

@@ -284,13 +454,16 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    protected void setupDownloadOptions() {
        setRadioButtonsState(false);

-        final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
-        final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+        final RadioButton audioButton = radioStreamsGroup.findViewById(R.id.audio_button);
+        final RadioButton videoButton = radioStreamsGroup.findViewById(R.id.video_button);
+        final RadioButton subtitleButton = radioStreamsGroup.findViewById(R.id.subtitle_button);
        final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
        final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+        final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;

        audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
        videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);

        if (isVideoStreamsAvailable) {
            videoButton.setChecked(true);
@@ -298,6 +471,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        } else if (isAudioStreamsAvailable) {
            audioButton.setChecked(true);
            setupAudioSpinner();
+        } else if (isSubtitleStreamsAvailable) {
+            subtitleButton.setChecked(true);
+            setupSubtitleSpinner();
        } else {
            Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
            getDialog().dismiss();
@@ -305,30 +481,367 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    private void setRadioButtonsState(boolean enabled) {
-        radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
-        radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.audio_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioStreamsGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
    }

-    private void downloadSelected() {
-        Stream stream;
-        String location;
+    private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
+        Localization loc = NewPipe.getPreferredLocalization();

-        String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
-
-        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
-        if (isAudio) {
-            stream = audioStreamsAdapter.getItem(selectedAudioIndex);
-            location = NewPipeSettings.getAudioDownloadPath(getContext());
-        } else {
-            stream = videoStreamsAdapter.getItem(selectedVideoIndex);
-            location = NewPipeSettings.getVideoDownloadPath(getContext());
+        for (int i = 0; i < streams.size(); i++) {
+            Locale streamLocale = streams.get(i).getLocale();
+            String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
+            if (tag.equalsIgnoreCase(loc.getLanguage())) {
+                return i;
+            }
        }

-        String url = stream.getUrl();
-        fileName += "." + stream.getFormat().getSuffix();
+        // fallback
+        // 1st loop match country & language
+        // 2nd loop match language only
+        int index = loc.getLanguage().indexOf("-");
+        String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();

-        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
-        getDialog().dismiss();
+        for (int j = 0; j < 2; j++) {
+            for (int i = 0; i < streams.size(); i++) {
+                Locale streamLocale = streams.get(i).getLocale();
+
+                if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
+                    if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
+                        return i;
+                    }
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    StoredDirectoryHelper mainStorageAudio = null;
+    StoredDirectoryHelper mainStorageVideo = null;
+    DownloadManager downloadManager = null;
+    ActionMenuItemView okButton = null;
+    Context context;
+    boolean askForSavePath;
+
+    private String getNameEditText() {
+        String str = nameEditText.getText().toString().trim();
+
+        return FilenameUtils.createFilename(context, str.isEmpty() ? currentInfo.getName() : str);
+    }
+
+    private void showFailedDialog(@StringRes int msg) {
+        new AlertDialog.Builder(context)
+                .setTitle(R.string.general_error)
+                .setMessage(msg)
+                .setNegativeButton(android.R.string.ok, null)
+                .create()
+                .show();
+    }
+
+    private void showErrorActivity(Exception e) {
+        ErrorActivity.reportError(
+                context,
+                Collections.singletonList(e),
+                null,
+                null,
+                ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "-", "-", R.string.general_error)
+        );
+    }
+
+    private void prepareSelectedDownload() {
+        StoredDirectoryHelper mainStorage;
+        MediaFormat format;
+        String mime;
+
+        // first, build the filename and get the output folder (if possible)
+        // later, run a very very very large file checking logic
+
+        String filename = getNameEditText().concat(".");
+
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                mainStorage = mainStorageAudio;
+                format = audioStreamsAdapter.getItem(selectedAudioIndex).getFormat();
+                mime = format.mimeType;
+                filename += format.suffix;
+                break;
+            case R.id.video_button:
+                mainStorage = mainStorageVideo;
+                format = videoStreamsAdapter.getItem(selectedVideoIndex).getFormat();
+                mime = format.mimeType;
+                filename += format.suffix;
+                break;
+            case R.id.subtitle_button:
+                mainStorage = mainStorageVideo;// subtitle & video files go together
+                format = subtitleStreamsAdapter.getItem(selectedSubtitleIndex).getFormat();
+                mime = format.mimeType;
+                filename += format == MediaFormat.TTML ? MediaFormat.SRT.suffix : format.suffix;
+                break;
+            default:
+                throw new RuntimeException("No stream selected");
+        }
+
+        if (mainStorage == null || askForSavePath) {
+            // This part is called if with SAF preferred:
+            //  * older android version running
+            //  * save path not defined (via download settings)
+            //  * the user checked the "ask where to download" option
+
+            if (!askForSavePath)
+                Toast.makeText(context, getString(R.string.no_available_dir), Toast.LENGTH_LONG).show();
+
+            if (NewPipeSettings.useStorageAccessFramework(context)) {
+                StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_SAVE_AS, filename, mime);
+            } else {
+                File initialSavePath;
+                if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button)
+                    initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MUSIC);
+                else
+                    initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MOVIES);
+
+                initialSavePath = new File(initialSavePath, filename);
+                startActivityForResult(
+                        FilePickerActivityHelper.chooseFileToSave(context, initialSavePath.getAbsolutePath()),
+                        REQUEST_DOWNLOAD_SAVE_AS
+                );
+            }
+
+            return;
+        }
+
+        // check for existing file with the same name
+        checkSelectedDownload(mainStorage, mainStorage.findFile(filename), filename, mime);
+    }
+
+    private void checkSelectedDownload(StoredDirectoryHelper mainStorage, Uri targetFile, String filename, String mime) {
+        StoredFileHelper storage;
+
+        try {
+            if (mainStorage == null) {
+                // using SAF on older android version
+                storage = new StoredFileHelper(context, null, targetFile, "");
+            } else if (targetFile == null) {
+                // the file does not exist, but it is probably used in a pending download
+                storage = new StoredFileHelper(mainStorage.getUri(), filename, mime, mainStorage.getTag());
+            } else {
+                // the target filename is already use, attempt to use it
+                storage = new StoredFileHelper(context, mainStorage.getUri(), targetFile, mainStorage.getTag());
+            }
+        } catch (Exception e) {
+            showErrorActivity(e);
+            return;
+        }
+
+        // check if is our file
+        MissionState state = downloadManager.checkForExistingMission(storage);
+        @StringRes int msgBtn;
+        @StringRes int msgBody;
+
+        switch (state) {
+            case Finished:
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.overwrite_finished_warning;
+                break;
+            case Pending:
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.download_already_pending;
+                break;
+            case PendingRunning:
+                msgBtn = R.string.generate_unique_name;
+                msgBody = R.string.download_already_running;
+                break;
+            case None:
+                if (mainStorage == null) {
+                    // This part is called if:
+                    // * using SAF on older android version
+                    // * save path not defined
+                    // * if the file exists overwrite it, is not necessary ask
+                    if (!storage.existsAsFile() && !storage.create()) {
+                        showFailedDialog(R.string.error_file_creation);
+                        return;
+                    }
+                    continueSelectedDownload(storage);
+                    return;
+                } else if (targetFile == null) {
+                    // This part is called if:
+                    // * the filename is not used in a pending/finished download
+                    // * the file does not exists, create
+
+                    if (!mainStorage.mkdirs()) {
+                        showFailedDialog(R.string.error_path_creation);
+                        return;
+                    }
+
+                    storage = mainStorage.createFile(filename, mime);
+                    if (storage == null || !storage.canWrite()) {
+                        showFailedDialog(R.string.error_file_creation);
+                        return;
+                    }
+
+                    continueSelectedDownload(storage);
+                    return;
+                }
+                msgBtn = R.string.overwrite;
+                msgBody = R.string.overwrite_unrelated_warning;
+                break;
+            default:
+                return;
+        }
+
+
+        AlertDialog.Builder askDialog = new AlertDialog.Builder(context)
+                .setTitle(R.string.download_dialog_title)
+                .setMessage(msgBody)
+                .setNegativeButton(android.R.string.cancel, null);
+        final StoredFileHelper finalStorage = storage;
+
+
+        if (mainStorage == null) {
+            // This part is called if:
+            // * using SAF on older android version
+            // * save path not defined
+            switch (state) {
+                case Pending:
+                case Finished:
+                    askDialog.setPositiveButton(msgBtn, (dialog, which) -> {
+                        dialog.dismiss();
+                        downloadManager.forgetMission(finalStorage);
+                        continueSelectedDownload(finalStorage);
+                    });
+                    break;
+            }
+
+            askDialog.create().show();
+            return;
+        }
+
+        askDialog.setPositiveButton(msgBtn, (dialog, which) -> {
+            dialog.dismiss();
+
+            StoredFileHelper storageNew;
+            switch (state) {
+                case Finished:
+                case Pending:
+                    downloadManager.forgetMission(finalStorage);
+                case None:
+                    if (targetFile == null) {
+                        storageNew = mainStorage.createFile(filename, mime);
+                    } else {
+                        try {
+                            // try take (or steal) the file
+                            storageNew = new StoredFileHelper(context, mainStorage.getUri(), targetFile, mainStorage.getTag());
+                        } catch (IOException e) {
+                            Log.e(TAG, "Failed to take (or steal) the file in " + targetFile.toString());
+                            storageNew = null;
+                        }
+                    }
+
+                    if (storageNew != null && storageNew.canWrite())
+                        continueSelectedDownload(storageNew);
+                    else
+                        showFailedDialog(R.string.error_file_creation);
+                    break;
+                case PendingRunning:
+                    storageNew = mainStorage.createUniqueFile(filename, mime);
+                    if (storageNew == null)
+                        showFailedDialog(R.string.error_file_creation);
+                    else
+                        continueSelectedDownload(storageNew);
+                    break;
+            }
+        });
+
+        askDialog.create().show();
+    }
+
+    private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
+        if (!storage.canWrite()) {
+            showFailedDialog(R.string.permission_denied);
+            return;
+        }
+
+        // check if the selected file has to be overwritten, by simply checking its length
+        try {
+            if (storage.length() > 0) storage.truncate();
+        } catch (IOException e) {
+            Log.e(TAG, "failed to truncate the file: " + storage.getUri().toString(), e);
+            showFailedDialog(R.string.overwrite_failed);
+            return;
+        }
+
+        Stream selectedStream;
+        char kind;
+        int threads = threadsSeekBar.getProgress() + 1;
+        String[] urls;
+        String psName = null;
+        String[] psArgs = null;
+        String secondaryStreamUrl = null;
+        long nearLength = 0;
+
+        // more download logic: select muxer, subtitle converter, etc.
+        switch (radioStreamsGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                kind = 'a';
+                selectedStream = audioStreamsAdapter.getItem(selectedAudioIndex);
+
+                if (selectedStream.getFormat() == MediaFormat.M4A) {
+                    psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
+                }
+                break;
+            case R.id.video_button:
+                kind = 'v';
+                selectedStream = videoStreamsAdapter.getItem(selectedVideoIndex);
+
+                SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                        .getAllSecondary()
+                        .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+                if (secondaryStream != null) {
+                    secondaryStreamUrl = secondaryStream.getStream().getUrl();
+
+                    if (selectedStream.getFormat() == MediaFormat.MPEG_4)
+                        psName = Postprocessing.ALGORITHM_MP4_FROM_DASH_MUXER;
+                    else
+                        psName = Postprocessing.ALGORITHM_WEBM_MUXER;
+
+                    psArgs = null;
+                    long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+                    // set nearLength, only, if both sizes are fetched or known. This probably
+                    // does not work on slow networks but is later updated in the downloader
+                    if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+                        nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                    }
+                }
+                break;
+            case R.id.subtitle_button:
+                threads = 1;// use unique thread for subtitles due small file size
+                kind = 's';
+                selectedStream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+
+                if (selectedStream.getFormat() == MediaFormat.TTML) {
+                    psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+                    psArgs = new String[]{
+                            selectedStream.getFormat().getSuffix(),
+                            "false",// ignore empty frames
+                            "false",// detect youtube duplicate lines
+                    };
+                }
+                break;
+            default:
+                return;
+        }
+
+        if (secondaryStreamUrl == null) {
+            urls = new String[]{selectedStream.getUrl()};
+        } else {
+            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+        }
+
+        DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
+
+        dismiss();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;

 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;

 import static org.schabi.newpipe.util.AnimationUtils.animateView;

@@ -51,9 +50,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
    protected Button errorButtonRetry;
    protected TextView errorTextView;

-    @State
-    protected boolean useAsFrontPage = false;
-
    @Override
    public void onViewCreated(View rootView, Bundle savedInstanceState) {
        super.onViewCreated(rootView, savedInstanceState);
@@ -66,9 +62,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        wasLoading.set(isLoading.get());
    }

-    public void useAsFrontPage(boolean value) {
-        useAsFrontPage = value;
-    }

    /*//////////////////////////////////////////////////////////////////////////
    // Init
@@ -93,12 +86,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        RxView.clicks(errorButtonRetry)
                .debounce(300, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Exception {
-                        onRetryButtonClicked();
-                    }
-                });
+                .subscribe(o -> onRetryButtonClicked());
    }

    protected void onRetryButtonClicked() {
@@ -192,7 +180,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        }

        if (exception instanceof ReCaptchaException) {
-            onReCaptchaException();
+            onReCaptchaException((ReCaptchaException) exception);
            return true;
        } else if (exception instanceof IOException) {
            showError(getString(R.string.network_error), true);
@@ -202,11 +190,13 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        return false;
    }

-    public void onReCaptchaException() {
+    public void onReCaptchaException(ReCaptchaException exception) {
        if (DEBUG) Log.d(TAG, "onReCaptchaException() called");
        Toast.makeText(activity, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
        // Starting ReCaptcha Challenge Activity
-        startActivityForResult(new Intent(activity, ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST);
+        Intent intent = new Intent(activity, ReCaptchaActivity.class);
+        intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA, exception.getUrl());
+        startActivityForResult(intent, ReCaptchaActivity.RECAPTCHA_REQUEST);

        showError(getString(R.string.recaptcha_request_toast), false);
    }
@@ -239,23 +229,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        if (rootView == null && getView() != null) rootView = getView();
        if (rootView == null) return;

-        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView, ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected void openUrlInBrowser(String url) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-        startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
-    }
-
-    protected void shareUrl(String subject, String url) {
-        Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType("text/plain");
-        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
-        intent.putExtra(Intent.EXTRA_TEXT, url);
-        startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView,
+                ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;

 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,24 +13,16 @@ public class BlankFragment extends BaseFragment {
    @Nullable
    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        if(activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar()
-                    .setTitle("NewPipe");
-        }
+        setTitle("NewPipe");
        return inflater.inflate(R.layout.fragment_blank, container, false);
    }

    @Override
    public void setUserVisibleHint(boolean isVisibleToUser) {
        super.setUserVisibleHint(isVisibleToUser);
-        if(isVisibleToUser) {
-            if(activity != null && activity.getSupportActionBar() != null) {
-                activity.getSupportActionBar()
-                        .setTitle("NewPipe");
-            }
-            // leave this inline. Will make it harder for copy cats.
-            // If you are a Copy cat FUCK YOU.
-            // I WILL FIND YOU, AND I WILL ...
-        }
+        setTitle("NewPipe");
+        // leave this inline. Will make it harder for copy cats.
+        // If you are a Copy cat FUCK YOU.
+        // I WILL FIND YOU, AND I WILL ...
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java
@@ -0,0 +1,17 @@
+package org.schabi.newpipe.fragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.R;
+
+public class EmptyFragment extends BaseFragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_empty, container, false);
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.fragments;

-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,48 +9,37 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;

 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.fragments.list.feed.FeedFragment;
-import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
-import org.schabi.newpipe.fragments.local.bookmark.BookmarkFragment;
-import org.schabi.newpipe.fragments.subscription.SubscriptionFragment;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.settings.tabs.Tab;
+import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
+
+import java.util.ArrayList;
+import java.util.List;

 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
-
-    public int currentServiceId = -1;
    private ViewPager viewPager;
+    private SelectedTabsPagerAdapter pagerAdapter;
+    private TabLayout tabLayout;

-    /*//////////////////////////////////////////////////////////////////////////
-    // Constants
-    //////////////////////////////////////////////////////////////////////////*/
+    private List<Tab> tabsList = new ArrayList<>();
+    private TabsManager tabsManager;

-    private static final int FALLBACK_SERVICE_ID = ServiceList.YouTube.getServiceId();
-    private static final String FALLBACK_CHANNEL_URL = "https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ";
-    private static final String FALLBACK_CHANNEL_NAME = "Music";
-    private static final String FALLBACK_KIOSK_ID = "Trending";
-    private static final int KIOSK_MENU_OFFSET = 2000;
+    private boolean hasTabsChanged = false;

    /*//////////////////////////////////////////////////////////////////////////
    // Fragment's LifeCycle
@@ -61,11 +49,35 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+
+        destroyOldFragments();
+
+        tabsManager = TabsManager.getManager(activity);
+        tabsManager.setSavedTabsListener(() -> {
+            if (DEBUG) {
+                Log.d(TAG, "TabsManager.SavedTabsChangeListener: onTabsChanged called, isResumed = " + isResumed());
+            }
+            if (isResumed()) {
+                updateTabs();
+            } else {
+                hasTabsChanged = true;
+            }
+        });
+    }
+
+    private void destroyOldFragments() {
+        for (Fragment fragment : getChildFragmentManager().getFragments()) {
+            if (fragment != null) {
+                getChildFragmentManager()
+                        .beginTransaction()
+                        .remove(fragment)
+                        .commitNowAllowingStateLoss();
+            }
+        }
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        currentServiceId = ServiceHelper.getSelectedServiceId(activity);
        return inflater.inflate(R.layout.fragment_main, container, false);
    }

@@ -73,30 +85,36 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

-        TabLayout tabLayout = rootView.findViewById(R.id.main_tab_layout);
+        tabLayout = rootView.findViewById(R.id.main_tab_layout);
        viewPager = rootView.findViewById(R.id.pager);

        /*  Nested fragment, use child fragment here to maintain backstack in view pager. */
-        PagerAdapter adapter = new PagerAdapter(getChildFragmentManager());
-        viewPager.setAdapter(adapter);
-        viewPager.setOffscreenPageLimit(adapter.getCount());
+        pagerAdapter = new SelectedTabsPagerAdapter(getChildFragmentManager());
+        viewPager.setAdapter(pagerAdapter);

        tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+        updateTabs();
+    }

-        int channelIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_channel);
-        int whatsHotIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_hot);
-        int bookmarkIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_bookmark);
+    @Override
+    public void onResume() {
+        super.onResume();

-        if (isSubscriptionsPageOnlySelected()) {
-            tabLayout.getTabAt(0).setIcon(channelIcon);
-            tabLayout.getTabAt(1).setIcon(bookmarkIcon);
-        } else {
-            tabLayout.getTabAt(0).setIcon(whatsHotIcon);
-            tabLayout.getTabAt(1).setIcon(channelIcon);
-            tabLayout.getTabAt(2).setIcon(bookmarkIcon);
+        if (hasTabsChanged) {
+            hasTabsChanged = false;
+            updateTabs();
        }
    }

+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        tabsManager.unsetSavedTabsListener();
+        pagerAdapter = null;
+        viewPager.setAdapter(pagerAdapter);
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Menu
    //////////////////////////////////////////////////////////////////////////*/
@@ -106,16 +124,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
        super.onCreateOptionsMenu(menu, inflater);
        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
        inflater.inflate(R.menu.main_fragment_menu, menu);
-        SubMenu kioskMenu = menu.addSubMenu(Menu.NONE, Menu.NONE, 200, getString(R.string.kiosk));
-        try {
-            createKioskMenu(kioskMenu, inflater);
-        } catch (Exception e) {
-            ErrorActivity.reportError(activity, e,
-                    activity.getClass(),
-                    null,
-                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                            "none", "", R.string.app_ui_crash));
-        }

        ActionBar supportActionBar = activity.getSupportActionBar();
        if (supportActionBar != null) {
@@ -127,7 +135,14 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.action_search:
-                NavigationHelper.openSearchFragment(getFragmentManager(), ServiceHelper.getSelectedServiceId(activity), "");
+                try {
+                    NavigationHelper.openSearchFragment(
+                            getFragmentManager(),
+                            ServiceHelper.getSelectedServiceId(activity),
+                            "");
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
                return true;
        }
        return super.onOptionsItemSelected(item);
@@ -137,9 +152,33 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    // Tabs
    //////////////////////////////////////////////////////////////////////////*/

+    public void updateTabs() {
+        tabsList.clear();
+        tabsList.addAll(tabsManager.getTabs());
+        pagerAdapter.notifyDataSetChanged();
+
+        viewPager.setOffscreenPageLimit(pagerAdapter.getCount());
+        updateTabsIcon();
+        updateCurrentTitle();
+    }
+
+    private void updateTabsIcon() {
+        for (int i = 0; i < tabsList.size(); i++) {
+            final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
+            if (tabToSet != null) {
+                tabToSet.setIcon(tabsList.get(i).getTabIconRes(activity));
+            }
+        }
+    }
+
+    private void updateCurrentTitle() {
+        setTitle(tabsList.get(viewPager.getCurrentItem()).getTabName(requireContext()));
+    }
+
    @Override
-    public void onTabSelected(TabLayout.Tab tab) {
-        viewPager.setCurrentItem(tab.getPosition());
+    public void onTabSelected(TabLayout.Tab selectedTab) {
+        if (DEBUG) Log.d(TAG, "onTabSelected() called with: selectedTab = [" + selectedTab + "]");
+        updateCurrentTitle();
    }

    @Override
@@ -148,129 +187,59 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte

    @Override
    public void onTabReselected(TabLayout.Tab tab) {
+        if (DEBUG) Log.d(TAG, "onTabReselected() called with: tab = [" + tab + "]");
+        updateCurrentTitle();
    }

-    private class PagerAdapter extends FragmentPagerAdapter {
-        PagerAdapter(FragmentManager fm) {
-            super(fm);
+    private class SelectedTabsPagerAdapter extends FragmentPagerAdapter {
+
+        private SelectedTabsPagerAdapter(FragmentManager fragmentManager) {
+            super(fragmentManager);
        }

        @Override
        public Fragment getItem(int position) {
-            switch (position) {
-                case 0:
-                    return isSubscriptionsPageOnlySelected() ? new SubscriptionFragment() : getMainPageFragment();
-                case 1:
-                    if(PreferenceManager.getDefaultSharedPreferences(getActivity())
-                            .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
-                            .equals(getString(R.string.subscription_page_key))) {
-                        return new BookmarkFragment();
-                    } else {
-                        return new SubscriptionFragment();
-                    }
-                case 2:
-                    return new BookmarkFragment();
-                default:
-                    return new BlankFragment();
+            final Tab tab = tabsList.get(position);
+
+            Throwable throwable = null;
+            Fragment fragment = null;
+            try {
+                fragment = tab.getFragment();
+            } catch (ExtractionException e) {
+                throwable = e;
            }
+
+            if (throwable != null) {
+                ErrorActivity.reportError(activity, throwable, activity.getClass(), null,
+                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
+                return new BlankFragment();
+            }
+
+            if (fragment instanceof BaseFragment) {
+                ((BaseFragment) fragment).useAsFrontPage(true);
+            }
+
+            return fragment;
        }

        @Override
-        public CharSequence getPageTitle(int position) {
-            //return getString(this.tabTitles[position]);
-            return "";
+        public int getItemPosition(Object object) {
+            // Causes adapter to reload all Fragments when
+            // notifyDataSetChanged is called
+            return POSITION_NONE;
        }

        @Override
        public int getCount() {
-            return isSubscriptionsPageOnlySelected() ? 2 : 3;
+            return tabsList.size();
        }
-    }

-    /*//////////////////////////////////////////////////////////////////////////
-    // Main page content
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private boolean isSubscriptionsPageOnlySelected() {
-        return PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
-                .equals(getString(R.string.subscription_page_key));
-    }
-
-    private Fragment getMainPageFragment() {
-        if (getActivity() == null) return new BlankFragment();
-
-        try {
-            SharedPreferences preferences =
-                    PreferenceManager.getDefaultSharedPreferences(getActivity());
-            final String setMainPage = preferences.getString(getString(R.string.main_page_content_key),
-                    getString(R.string.main_page_selectd_kiosk_id));
-            if (setMainPage.equals(getString(R.string.blank_page_key))) {
-                return new BlankFragment();
-            } else if (setMainPage.equals(getString(R.string.kiosk_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String kioskId = preferences.getString(getString(R.string.main_page_selectd_kiosk_id),
-                        FALLBACK_KIOSK_ID);
-                KioskFragment fragment = KioskFragment.getInstance(serviceId, kioskId);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.feed_page_key))) {
-                FeedFragment fragment = new FeedFragment();
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.channel_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String url = preferences.getString(getString(R.string.main_page_selected_channel_url),
-                        FALLBACK_CHANNEL_URL);
-                String name = preferences.getString(getString(R.string.main_page_selected_channel_name),
-                        FALLBACK_CHANNEL_NAME);
-                ChannelFragment fragment = ChannelFragment.getInstance(serviceId, url, name);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else {
-                return new BlankFragment();
-            }
-
-        } catch (Exception e) {
-            ErrorActivity.reportError(activity, e,
-                    activity.getClass(),
-                    null,
-                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                            "none", "", R.string.app_ui_crash));
-            return new BlankFragment();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Select Kiosk
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void createKioskMenu(Menu menu, MenuInflater menuInflater)
-            throws Exception {
-        StreamingService service = NewPipe.getService(currentServiceId);
-        KioskList kl = service.getKioskList();
-        int i = 0;
-        for (final String ks : kl.getAvailableKiosks()) {
-            menu.add(0, KIOSK_MENU_OFFSET + i, Menu.NONE,
-                    KioskTranslator.getTranslatedKioskName(ks, getContext()))
-                    .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem menuItem) {
-                            try {
-                                NavigationHelper.openKioskFragment(getFragmentManager(), currentServiceId, ks);
-                            } catch (Exception e) {
-                                ErrorActivity.reportError(activity, e,
-                                        activity.getClass(),
-                                        null,
-                                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                                                "none", "", R.string.app_ui_crash));
-                            }
-                            return true;
-                        }
-                    });
-            i++;
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .remove((Fragment) object)
+                    .commitNowAllowingStateLoss();
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
@@ -3,9 +3,9 @@ package org.schabi.newpipe.fragments.detail;
 import java.io.Serializable;

 class StackItem implements Serializable {
-    private int serviceId;
+    private final int serviceId;
    private String title;
-    private String url;
+    private final String url;

    StackItem(int serviceId, String url, String title) {
        this.serviceId = serviceId;
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java
@@ -0,0 +1,86 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabAdaptor extends FragmentPagerAdapter {
+
+    private final List<Fragment> mFragmentList = new ArrayList<>();
+    private final List<String> mFragmentTitleList = new ArrayList<>();
+    private final FragmentManager fragmentManager;
+
+    public TabAdaptor(FragmentManager fm) {
+        super(fm);
+        this.fragmentManager = fm;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragmentList.size();
+    }
+
+    public void addFragment(Fragment fragment, String title) {
+        mFragmentList.add(fragment);
+        mFragmentTitleList.add(title);
+    }
+
+    public void clearAllItems() {
+        mFragmentList.clear();
+        mFragmentTitleList.clear();
+    }
+
+    public void removeItem(int position){
+        mFragmentList.remove(position == 0 ? 0 : position - 1);
+        mFragmentTitleList.remove(position == 0 ? 0 : position - 1);
+    }
+
+    public void updateItem(int position, Fragment fragment){
+        mFragmentList.set(position, fragment);
+    }
+
+    public void updateItem(String title, Fragment fragment){
+        int index = mFragmentTitleList.indexOf(title);
+        if(index != -1){
+            updateItem(index, fragment);
+        }
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        if (mFragmentList.contains(object)) return mFragmentList.indexOf(object);
+        else return POSITION_NONE;
+    }
+
+    public int getItemPositionByTitle(String title) {
+        return mFragmentTitleList.indexOf(title);
+    }
+
+    @Nullable
+    public String getItemTitle(int position) {
+        if (position < 0 || position >= mFragmentTitleList.size()) {
+            return null;
+        }
+        return mFragmentTitleList.get(position);
+    }
+
+    public void notifyDataSetUpdate(){
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        fragmentManager.beginTransaction().remove((Fragment) object).commitNowAllowingStateLoss();
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -2,10 +2,15 @@ package org.schabi.newpipe.fragments.list;

 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -16,25 +21,26 @@ import android.view.View;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
+import org.schabi.newpipe.util.StreamDialogEntry;

-import java.util.Collections;
 import java.util.List;
 import java.util.Queue;

 import static org.schabi.newpipe.util.AnimationUtils.animateView;

-public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead {
+public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {

    /*//////////////////////////////////////////////////////////////////////////
    // Views
@@ -42,6 +48,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem

    protected InfoListAdapter infoListAdapter;
    protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

    /*//////////////////////////////////////////////////////////////////////////
    // LifeCycle
@@ -53,16 +62,40 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        infoListAdapter = new InfoListAdapter(activity);
    }

+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
    }

    @Override
    public void onDestroy() {
        super.onDestroy();
        StateSaver.onDestroy(savedState);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -117,13 +150,25 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        return new LinearLayoutManager(activity);
    }

+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    @Override
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

+        final boolean useGrid = isGridLayout();
        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());

+        infoListAdapter.setGridItemVariants(useGrid);
        infoListAdapter.setFooter(getListFooter());
        infoListAdapter.setHeader(getListHeader());

@@ -140,9 +185,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<StreamInfoItem>() {
            @Override
            public void selected(StreamInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openVideoDetailFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                onStreamSelected(selectedItem);
            }

            @Override
@@ -154,18 +197,37 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
            @Override
            public void selected(ChannelInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openChannelFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openChannelFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<PlaylistInfoItem>() {
            @Override
            public void selected(PlaylistInfoItem selectedItem) {
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openPlaylistFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
+            }
+        });
+
+        infoListAdapter.setOnCommentsSelectedListener(new OnClickGesture<CommentsInfoItem>() {
+            @Override
+            public void selected(CommentsInfoItem selectedItem) {
                onItemSelected(selectedItem);
-                NavigationHelper.openPlaylistFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
            }
        });

@@ -178,44 +240,46 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        });
    }

+    private void onStreamSelected(StreamInfoItem selectedItem) {
+        onItemSelected(selectedItem);
+        NavigationHelper.openVideoDetailFragment(getFM(),
+                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+    }
+
    protected void onScrollToBottom() {
        if (hasMoreItems() && !isLoading.get()) {
            loadMoreItems();
        }
    }

+
+
+
    protected void showStreamDialog(final StreamInfoItem item) {
        final Context context = getContext();
        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || getActivity() == null) return;
+        if (context == null || context.getResources() == null || activity == null) return;

-        final String[] commands = new String[]{
-                context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.append_playlist)
-        };
+        if (item.getStreamType() == StreamType.AUDIO_STREAM) {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+        } else {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.enqueue_on_popup,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.start_here_on_popup,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+        }

-        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
-            switch (i) {
-                case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                    break;
-                case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                    break;
-                case 2:
-                    if (getFragmentManager() != null) {
-                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
-                                .show(getFragmentManager(), TAG);
-                    }
-                    break;
-                default:
-                    break;
-            }
-        };
-
-        new InfoItemDialog(getActivity(), item, commands, actions).show();
+        new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context), (dialog, which) ->
+            StreamDialogEntry.clickOn(which, this, item)).show();
    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Menu
    //////////////////////////////////////////////////////////////////////////*/
@@ -285,4 +349,22 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
    public void handleNextItems(N result) {
        isLoading.set(false);
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -16,7 +16,6 @@ import icepick.State;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;

 public abstract class BaseListInfoFragment<I extends ListInfo>
@@ -166,7 +165,6 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
    public void handleResult(@NonNull I result) {
        super.handleResult(result);

-        url = result.getUrl();
        name = result.getName();
        setTitle(name);

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -1,8 +1,6 @@
 package org.schabi.newpipe.fragments.list.channel;

-import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -32,25 +30,20 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.stream.Stream;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.ChannelPlayQueue;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.local.subscription.SubscriptionService;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.subscription.SubscriptionService;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ShareUtils;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

@@ -70,7 +63,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;

 public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {

-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
    private Disposable subscribeButtonMonitor;
    private SubscriptionService subscriptionService;

@@ -151,55 +144,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        return headerRootLayout;
    }

-    @Override
-    protected void showStreamDialog(final StreamInfoItem item) {
-        final Activity activity = getActivity();
-        final Context context = getContext();
-        if (context == null || context.getResources() == null || getActivity() == null) return;
-
-        final String[] commands = new String[]{
-                context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.start_here_on_main),
-                context.getResources().getString(R.string.start_here_on_background),
-                context.getResources().getString(R.string.start_here_on_popup),
-                context.getResources().getString(R.string.append_playlist)
-        };
-
-        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
-                switch (i) {
-                    case 0:
-                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                        break;
-                    case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                        break;
-                    case 2:
-                        NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                        break;
-                    case 3:
-                        NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                        break;
-                    case 4:
-                        NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                        break;
-                    case 5:
-                        if (getFragmentManager() != null) {
-                            PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
-                                    .show(getFragmentManager(), TAG);
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-        };
-
-        new InfoItemDialog(getActivity(), item, commands, actions).show();
-    }
    /*//////////////////////////////////////////////////////////////////////////
    // Menu
    //////////////////////////////////////////////////////////////////////////*/
@@ -234,10 +178,10 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                openRssFeed();
                break;
            case R.id.menu_item_openInBrowser:
-                openUrlInBrowser(url);
+                ShareUtils.openUrlInBrowser(this.getContext(), currentInfo.getOriginalUrl());
                break;
            case R.id.menu_item_share:
-                shareUrl(name, url);
+                ShareUtils.shareUrl(this.getContext(), name, currentInfo.getOriginalUrl());
                break;
            default:
                return super.onOptionsItemSelected(item);
@@ -252,12 +196,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    private static final int BUTTON_DEBOUNCE_INTERVAL = 100;

    private void monitorSubscription(final ChannelInfo info) {
-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable throwable) throws Exception {
+        final Consumer<Throwable> onError = (Throwable throwable) -> {
                animateView(headerSubscribeButton, false, 100);
-                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Get subscription status", 0);
-            }
+                showSnackBarError(throwable, UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Get subscription status",
+                        0);
        };

        final Observable<List<SubscriptionEntity>> observable = subscriptionService.subscriptionTable()
@@ -273,50 +217,38 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                // so only update the UI for the latest emission ("sync" the subscribe button's state)
                .debounce(100, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        updateSubscribeButton(!subscriptionEntities.isEmpty());
-                    }
-                }, onError));
+                .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
+                        updateSubscribeButton(!subscriptionEntities.isEmpty())
+                        , onError));

    }

    private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().insert(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().insert(subscription);
+            return o;
        };
    }

    private Function<Object, Object> mapOnUnsubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().delete(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().delete(subscription);
+            return o;
        };
    }

    private void updateSubscription(final ChannelInfo info) {
        if (DEBUG) Log.d(TAG, "updateSubscription() called with: info = [" + info + "]");
-        final Action onComplete = new Action() {
-            @Override
-            public void run() throws Exception {
+        final Action onComplete = () -> {
                if (DEBUG) Log.d(TAG, "Updated subscription: " + info.getUrl());
-            }
        };

-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(info.getServiceId()), "Updating Subscription for " + info.getUrl(), R.string.subscription_update_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(info.getServiceId()),
+                        "Updating Subscription for " + info.getUrl(),
+                        R.string.subscription_update_failed);

        disposables.add(subscriptionService.updateChannelInfo(info)
                .subscribeOn(Schedulers.io())
@@ -325,19 +257,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    }

    private Disposable monitorSubscribeButton(final Button subscribeButton, final Function<Object, Object> action) {
-        final Consumer<Object> onNext = new Consumer<Object>() {
-            @Override
-            public void accept(@NonNull Object o) throws Exception {
+        final Consumer<Object> onNext = (@NonNull Object o) -> {
                if (DEBUG) Log.d(TAG, "Changed subscription status to this channel!");
-            }
        };

-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Subscription Change", R.string.subscription_change_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Subscription Change",
+                        R.string.subscription_change_failed);

        /* Emit clicks from main thread unto io thread */
        return RxView.clicks(subscribeButton)
@@ -349,25 +278,25 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    }

    private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final ChannelInfo info) {
-        return new Consumer<List<SubscriptionEntity>>() {
-            @Override
-            public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                if (DEBUG)
-                    Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
-                if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
+            if (DEBUG)
+                Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
+            if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();

-                if (subscriptionEntities.isEmpty()) {
-                    if (DEBUG) Log.d(TAG, "No subscription to this channel!");
-                    SubscriptionEntity channel = new SubscriptionEntity();
-                    channel.setServiceId(info.getServiceId());
-                    channel.setUrl(info.getUrl());
-                    channel.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
-                } else {
-                    if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
-                    final SubscriptionEntity subscription = subscriptionEntities.get(0);
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
-                }
+            if (subscriptionEntities.isEmpty()) {
+                if (DEBUG) Log.d(TAG, "No subscription to this channel!");
+                SubscriptionEntity channel = new SubscriptionEntity();
+                channel.setServiceId(info.getServiceId());
+                channel.setUrl(info.getUrl());
+                channel.setData(info.getName(),
+                        info.getAvatarUrl(),
+                        info.getDescription(),
+                        info.getSubscriberCount());
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
+            } else {
+                if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
+                final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
            }
        };
    }
@@ -434,10 +363,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        imageLoader.displayImage(result.getAvatarUrl(), headerAvatarView,
        		ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);

-        if (result.getSubscriberCount() != -1) {
+        headerSubscribersTextView.setVisibility(View.VISIBLE);
+        if (result.getSubscriberCount() >= 0) {
            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
-            headerSubscribersTextView.setVisibility(View.VISIBLE);
-        } else headerSubscribersTextView.setVisibility(View.GONE);
+        } else {
+            headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
+        }

        if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));

@@ -453,11 +384,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        monitorSubscription(result);

        headerPlayAllButton.setOnClickListener(
-                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
        headerPopupButton.setOnClickListener(
-                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
        headerBackgroundButton.setOnClickListener(
-                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
    }

    private PlayQueue getPlayQueue() {
@@ -485,8 +416,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        super.handleNextItems(result);

        if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId),
-                    "Get next page of: " + url, R.string.general_error);
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_CHANNEL,
+                    NewPipe.getNameOfService(serviceId),
+                    "Get next page of: " + url,
+                    R.string.general_error);
        }
    }

@@ -499,7 +433,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_CHANNEL,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

@@ -510,6 +448,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    @Override
    public void setTitle(String title) {
        super.setTitle(title);
-        headerTitleView.setText(title);
+        if (!useAsFrontPage) headerTitleView.setText(title);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -0,0 +1,149 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.comments.CommentsInfo;
+import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.ExtractorHelper;
+
+import io.reactivex.Single;
+import io.reactivex.disposables.CompositeDisposable;
+
+public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
+
+    private CompositeDisposable disposables = new CompositeDisposable();
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+
+
+    private boolean mIsVisibleToUser = false;
+
+    public static CommentsFragment getInstance(int serviceId, String url, String name) {
+        CommentsFragment instance = new CommentsFragment();
+        instance.setInitialData(serviceId, url, name);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_comments, container, false);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (disposables != null) disposables.clear();
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreCommentItems(serviceId, currentInfo, currentNextPageUrl);
+    }
+
+    @Override
+    protected Single<CommentsInfo> loadResult(boolean forceLoad) {
+        return ExtractorHelper.getCommentsInfo(serviceId, url, forceLoad);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+    }
+
+    @Override
+    public void handleResult(@NonNull CommentsInfo result) {
+        super.handleResult(result);
+
+        AnimationUtils.slideUp(getView(),120, 96, 0.06f);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+
+        if (disposables != null) disposables.clear();
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        super.handleNextItems(result);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_COMMENTS,
+                    NewPipe.getNameOfService(serviceId),
+                    "Get next page of: " + url,
+                    R.string.general_error);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnError
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        if (super.onError(exception)) return true;
+
+        hideLoading();
+        showSnackBarError(exception, UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(serviceId), url, R.string.error_unable_to_load_comments);
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(String title) {
+        return;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        return;
+    }
+
+    @Override
+    protected boolean isGridLayout() {
+        return false;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -1,32 +1,26 @@
 package org.schabi.newpipe.fragments.list.kiosk;

 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.NavigationHelper;

 import icepick.State;
 import io.reactivex.Single;
@@ -59,6 +53,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
    protected String kioskId = "";
    protected String kioskTranslatedName;

+
    /*//////////////////////////////////////////////////////////////////////////
    // Views
    //////////////////////////////////////////////////////////////////////////*/
@@ -74,11 +69,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
            throws ExtractionException {
        KioskFragment instance = new KioskFragment();
        StreamingService service = NewPipe.getService(serviceId);
-        UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
-                .getUrlIdHandlerByType(kioskId);
+        ListLinkHandlerFactory kioskLinkHandlerFactory = service.getKioskList()
+                .getListLinkHandlerFactoryByType(kioskId);
        instance.setInitialData(serviceId,
-                kioskTypeUrlIdHandler.getUrl(kioskId),
-                kioskId);
+                kioskLinkHandlerFactory.fromId(kioskId).getUrl(), kioskId);
        instance.kioskId = kioskId;
        return instance;
    }
@@ -133,20 +127,16 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {

    @Override
    public Single<KioskInfo> loadResult(boolean forceReload) {
-        String contentCountry = PreferenceManager
-                .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.content_country_key),
-                        getString(R.string.default_country_value));
-        return ExtractorHelper.getKioskInfo(serviceId, url, contentCountry, forceReload);
+        return ExtractorHelper.getKioskInfo(serviceId,
+                url,
+                forceReload);
    }

    @Override
    public Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
-        String contentCountry = PreferenceManager
-                .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.content_country_key),
-                        getString(R.string.default_country_value));
-        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextPageUrl, contentCountry);
+        return ExtractorHelper.getMoreKioskItems(serviceId,
+                url,
+                currentNextPageUrl);
    }

    /*//////////////////////////////////////////////////////////////////////////
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -2,10 +2,11 @@ package org.schabi.newpipe.fragments.list.playlist;

 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -27,24 +28,27 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.fragments.local.RemotePlaylistManager;
 import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.PlaylistPlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ShareUtils;
+import org.schabi.newpipe.util.StreamDialogEntry;
 import org.schabi.newpipe.util.ThemeHelper;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

+import io.reactivex.Flowable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -94,7 +98,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        super.onCreate(savedInstanceState);
        disposables = new CompositeDisposable();
        isBookmarkButtonReady = new AtomicBoolean(false);
-        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(getContext()));
+        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(
+                requireContext()));
    }

    @Override
@@ -131,44 +136,40 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        infoListAdapter.useMiniItemVariants(true);
    }

+    private PlayQueue getPlayQueueStartingAt(StreamInfoItem infoItem) {
+        return getPlayQueue(Math.max(infoListAdapter.getItemsList().indexOf(infoItem), 0));
+    }
+
    @Override
-    protected void showStreamDialog(final StreamInfoItem item) {
+    protected void showStreamDialog(StreamInfoItem item) {
        final Context context = getContext();
        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || getActivity() == null) return;
+        if (context == null || context.getResources() == null || activity == null) return;

-        final String[] commands = new String[]{
-                context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.start_here_on_main),
-                context.getResources().getString(R.string.start_here_on_background),
-                context.getResources().getString(R.string.start_here_on_popup),
-        };
+        if (item.getStreamType() == StreamType.AUDIO_STREAM) {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+        } else {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.enqueue_on_popup,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.start_here_on_popup,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);

-        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
-            final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
-            switch (i) {
-                case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                    break;
-                case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                    break;
-                case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                    break;
-                case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                    break;
-                case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                    break;
-                default:
-                    break;
-            }
-        };
+            StreamDialogEntry.start_here_on_popup.setCustomAction(
+                    (fragment, infoItem) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(infoItem), true));
+        }

-        new InfoItemDialog(getActivity(), item, commands, actions).show();
+        StreamDialogEntry.start_here_on_background.setCustomAction(
+                (fragment, infoItem) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(infoItem), true));
+
+        new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context), (dialog, which) ->
+                StreamDialogEntry.clickOn(which, this, item)).show();
    }

    @Override
@@ -223,10 +224,10 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.menu_item_openInBrowser:
-                openUrlInBrowser(url);
+                ShareUtils.openUrlInBrowser(this.getContext(), url);
                break;
            case R.id.menu_item_share:
-                shareUrl(name, url);
+                ShareUtils.shareUrl(this.getContext(), name, url);
                break;
            case R.id.menu_item_bookmark:
                onBookmarkClicked();
@@ -262,11 +263,16 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (!TextUtils.isEmpty(result.getUploaderName())) {
            headerUploaderName.setText(result.getUploaderName());
            if (!TextUtils.isEmpty(result.getUploaderUrl())) {
-                headerUploaderLayout.setOnClickListener(v ->
+                headerUploaderLayout.setOnClickListener(v -> {
+                    try {
                        NavigationHelper.openChannelFragment(getFragmentManager(),
-                                result.getServiceId(), result.getUploaderUrl(),
-                                result.getUploaderName())
-                );
+                                result.getServiceId(),
+                                result.getUploaderUrl(),
+                                result.getUploaderName());
+                    } catch (Exception e) {
+                        ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                    }
+                });
            }
        }

@@ -282,20 +288,27 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        }

        remotePlaylistManager.getPlaylist(result)
+                .flatMap(lists -> getUpdateProcessor(lists, result), (lists, id) -> lists)
                .onBackpressureLatest()
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(getPlaylistBookmarkSubscriber());

-        remotePlaylistManager.onUpdate(result)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(integer -> {/* Do nothing*/}, this::onError);
-
        headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
        headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
        headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
+
+        headerPopupButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
+            return true;
+        });
+
+        headerBackgroundButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
+            return true;
+        });
    }

    private PlayQueue getPlayQueue() {
@@ -337,7 +350,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_PLAYLIST,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

@@ -345,6 +362,17 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

+    private Flowable<Integer> getUpdateProcessor(@NonNull List<PlaylistRemoteEntity> playlists,
+                                                 @NonNull PlaylistInfo result) {
+        final Flowable<Integer> noItemToUpdate = Flowable.just(/*noItemToUpdate=*/-1);
+        if (playlists.isEmpty()) return noItemToUpdate;
+
+        final PlaylistRemoteEntity playlistEntity = playlists.get(0);
+        if (playlistEntity.isIdenticalTo(result)) return noItemToUpdate;
+
+        return remotePlaylistManager.onUpdate(playlists.get(0).getUid(), result).toFlowable();
+    }
+
    private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
        return new Subscriber<List<PlaylistRemoteEntity>>() {
            @Override
@@ -417,4 +445,4 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
        playlistBookmarkButton.setTitle(titleRes);
    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -12,6 +12,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.TooltipCompat;
+import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -37,26 +38,30 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.search.SearchInfo;
+import org.schabi.newpipe.util.FireTvUtils;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
-import org.schabi.newpipe.history.HistoryRecordManager;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.LayoutManagerSmoothScroller;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ServiceHelper;

 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Queue;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;

 import icepick.State;
@@ -65,14 +70,15 @@ import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;

+import static android.support.v7.widget.helper.ItemTouchHelper.Callback.makeMovementFlags;
+import static java.util.Arrays.asList;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;

 public class SearchFragment
-        extends BaseListFragment<SearchResult, ListExtractor.InfoItemsPage>
+        extends BaseListFragment<SearchInfo, ListExtractor.InfoItemsPage>
        implements BackPressable {

    /*//////////////////////////////////////////////////////////////////////////
@@ -92,27 +98,41 @@ public class SearchFragment

    @State
    protected int filterItemCheckedId = -1;
-    private SearchEngine.Filter filter = SearchEngine.Filter.ANY;

    @State
    protected int serviceId = Constants.NO_SERVICE_ID;
+    
+    // this three represet the current search query
    @State
-    protected String searchQuery;
+    protected String searchString;
+
+    /**
+     * No content filter should add like contentfilter = all
+     * be aware of this when implementing an extractor.
+     */
    @State
-    protected String lastSearchedQuery;
+    protected String[] contentFilter = new String[0];
+    @State
+    protected String sortFilter;
+    
+    // these represtent the last search
+    @State
+    protected String lastSearchedString;
+    
    @State
    protected boolean wasSearchFocused = false;

-    private int currentPage = 0;
-    private int currentNextPage = 0;
+    private Map<Integer, String> menuItemToFilterName;
+    private StreamingService service;
+    private String currentPageUrl;
+    private String nextPageUrl;
    private String contentCountry;
    private boolean isSuggestionsEnabled = true;
-    private boolean isSearchHistoryEnabled = true;

-    private PublishSubject<String> suggestionPublisher = PublishSubject.create();
+    private final PublishSubject<String> suggestionPublisher = PublishSubject.create();
    private Disposable searchDisposable;
    private Disposable suggestionDisposable;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();

    private SuggestionListAdapter suggestionListAdapter;
    private HistoryRecordManager historyRecordManager;
@@ -130,11 +150,11 @@ public class SearchFragment

    /*////////////////////////////////////////////////////////////////////////*/

-    public static SearchFragment getInstance(int serviceId, String query) {
+    public static SearchFragment getInstance(int serviceId, String searchString) {
        SearchFragment searchFragment = new SearchFragment();
-        searchFragment.setQuery(serviceId, query);
+        searchFragment.setQuery(serviceId, searchString, new String[0], "");

-        if (!TextUtils.isEmpty(query)) {
+        if (!TextUtils.isEmpty(searchString)) {
            searchFragment.setSearchOnResume();
        }

@@ -158,7 +178,7 @@ public class SearchFragment

        suggestionListAdapter = new SuggestionListAdapter(activity);
        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        boolean isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
        suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);

        historyRecordManager = new HistoryRecordManager(context);
@@ -202,13 +222,22 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "onResume() called");
        super.onResume();

-        if (!TextUtils.isEmpty(searchQuery)) {
+        try {
+            service = NewPipe.getService(serviceId);
+        } catch (Exception e) {
+            ErrorActivity.reportError(getActivity(), e, getActivity().getClass(),
+                    getActivity().findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
+                            "",
+                            "", R.string.general_error));
+        }
+
+        if (!TextUtils.isEmpty(searchString)) {
            if (wasLoading.getAndSet(false)) {
-                if (currentNextPage > currentPage) loadMoreItems();
-                else search(searchQuery);
+                search(searchString, contentFilter, sortFilter);
            } else if (infoListAdapter.getItemsList().size() == 0) {
                if (savedState == null) {
-                    search(searchQuery);
+                    search(searchString, contentFilter, sortFilter);
                } else if (!isLoading.get() && !wasSearchFocused) {
                    infoListAdapter.clearStreamItemList();
                    showEmptyState();
@@ -218,7 +247,7 @@ public class SearchFragment

        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();

-        if (TextUtils.isEmpty(searchQuery) || wasSearchFocused) {
+        if (TextUtils.isEmpty(searchString) || wasSearchFocused) {
            showKeyboardSearch();
            showSuggestionsPanel();
        } else {
@@ -247,8 +276,9 @@ public class SearchFragment
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
        switch (requestCode) {
            case ReCaptchaActivity.RECAPTCHA_REQUEST:
-                if (resultCode == Activity.RESULT_OK && !TextUtils.isEmpty(searchQuery)) {
-                    search(searchQuery);
+                if (resultCode == Activity.RESULT_OK
+                        && !TextUtils.isEmpty(searchString)) {
+                    search(searchString, contentFilter, sortFilter);
                } else Log.e(TAG, "ReCaptcha failed");
                break;

@@ -268,7 +298,23 @@ public class SearchFragment
        suggestionsPanel = rootView.findViewById(R.id.suggestions_panel);
        suggestionsRecyclerView = rootView.findViewById(R.id.suggestions_list);
        suggestionsRecyclerView.setAdapter(suggestionListAdapter);
-        suggestionsRecyclerView.setLayoutManager(new LayoutManagerSmoothScroller(activity));
+        new ItemTouchHelper(new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
+                return getSuggestionMovementFlags(recyclerView, viewHolder);
+            }
+
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder,
+                                  @NonNull RecyclerView.ViewHolder viewHolder1) {
+                return false;
+            }
+
+            @Override
+            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+                onSuggestionItemSwiped(viewHolder, i);
+            }
+        }).attachToRecyclerView(suggestionsRecyclerView);

        searchToolbarContainer = activity.findViewById(R.id.toolbar_search_container);
        searchEditText = searchToolbarContainer.findViewById(R.id.toolbar_search_edit_text);
@@ -282,20 +328,22 @@ public class SearchFragment
    @Override
    public void writeTo(Queue<Object> objectsToSave) {
        super.writeTo(objectsToSave);
-        objectsToSave.add(currentPage);
-        objectsToSave.add(currentNextPage);
+        objectsToSave.add(currentPageUrl);
+        objectsToSave.add(nextPageUrl);
    }

    @Override
    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
        super.readFrom(savedObjects);
-        currentPage = (int) savedObjects.poll();
-        currentNextPage = (int) savedObjects.poll();
+        currentPageUrl = (String) savedObjects.poll();
+        nextPageUrl = (String) savedObjects.poll();
    }

    @Override
    public void onSaveInstanceState(Bundle bundle) {
-        searchQuery = searchEditText != null ? searchEditText.getText().toString() : searchQuery;
+        searchString = searchEditText != null
+                ? searchEditText.getText().toString()
+                : searchString;
        super.onSaveInstanceState(bundle);
    }

@@ -305,8 +353,11 @@ public class SearchFragment

    @Override
    public void reloadContent() {
-        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
-            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString());
+        if (!TextUtils.isEmpty(searchString)
+                || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
+            search(!TextUtils.isEmpty(searchString)
+                    ? searchString
+                    : searchEditText.getText().toString(), this.contentFilter, "");
        } else {
            if (searchEditText != null) {
                searchEditText.setText("");
@@ -330,22 +381,35 @@ public class SearchFragment
            supportActionBar.setDisplayHomeAsUpEnabled(true);
        }

-        inflater.inflate(R.menu.menu_search, menu);
+        menuItemToFilterName = new HashMap<>();
+
+        int itemId = 0;
+        boolean isFirstItem = true;
+        final Context c = getContext();
+        for(String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
+            menuItemToFilterName.put(itemId, filter);
+            MenuItem item = menu.add(1,
+                    itemId++,
+                    0,
+                    ServiceHelper.getTranslatedFilterString(filter, c));
+            if(isFirstItem) {
+                item.setChecked(true);
+                isFirstItem = false;
+            }
+        }
+        menu.setGroupCheckable(1, true, true);
+
        restoreFilterChecked(menu, filterItemCheckedId);
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_filter_all:
-            case R.id.menu_filter_video:
-            case R.id.menu_filter_channel:
-            case R.id.menu_filter_playlist:
-                changeFilter(item, getFilterFromMenuId(item.getItemId()));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+
+        List<String> contentFilter = new ArrayList<>(1);
+        contentFilter.add(menuItemToFilterName.get(item.getItemId()));
+        changeContentFilter(item, contentFilter);
+
+        return true;
    }

    private void restoreFilterChecked(Menu menu, int itemId) {
@@ -354,21 +418,6 @@ public class SearchFragment
            if (item == null) return;

            item.setChecked(true);
-            filter = getFilterFromMenuId(itemId);
-        }
-    }
-
-    private SearchEngine.Filter getFilterFromMenuId(int itemId) {
-        switch (itemId) {
-            case R.id.menu_filter_video:
-                return SearchEngine.Filter.STREAM;
-            case R.id.menu_filter_channel:
-                return SearchEngine.Filter.CHANNEL;
-            case R.id.menu_filter_playlist:
-                return SearchEngine.Filter.PLAYLIST;
-            case R.id.menu_filter_all:
-            default:
-                return SearchEngine.Filter.ANY;
        }
    }

@@ -379,14 +428,21 @@ public class SearchFragment
    private TextWatcher textWatcher;

    private void showSearchOnStart() {
-        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → " + searchQuery+", lastSearchedQuery → " + lastSearchedQuery);
-        searchEditText.setText(searchQuery);
+        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → "
+                + searchString
+                + ", lastSearchedQuery → "
+                + lastSearchedString);
+        searchEditText.setText(searchString);

-        if (TextUtils.isEmpty(searchQuery) || TextUtils.isEmpty(searchEditText.getText())) {
+        if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
            searchToolbarContainer.setTranslationX(100);
            searchToolbarContainer.setAlpha(0f);
            searchToolbarContainer.setVisibility(View.VISIBLE);
-            searchToolbarContainer.animate().translationX(0).alpha(1f).setDuration(200).setInterpolator(new DecelerateInterpolator()).start();
+            searchToolbarContainer.animate()
+                    .translationX(0)
+                    .alpha(1f)
+                    .setDuration(200)
+                    .setInterpolator(new DecelerateInterpolator()).start();
        } else {
            searchToolbarContainer.setTranslationX(0);
            searchToolbarContainer.setAlpha(1f);
@@ -396,47 +452,41 @@ public class SearchFragment

    private void initSearchListeners() {
        if (DEBUG) Log.d(TAG, "initSearchListeners() called");
-        searchClear.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (TextUtils.isEmpty(searchEditText.getText())) {
-                    NavigationHelper.gotoMainFragment(getFragmentManager());
-                    return;
-                }
-
-                searchEditText.setText("");
-                suggestionListAdapter.setItems(new ArrayList<SuggestionItem>());
-                showKeyboardSearch();
+        searchClear.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (TextUtils.isEmpty(searchEditText.getText())) {
+                NavigationHelper.gotoMainFragment(getFragmentManager());
+                return;
            }
+
+            searchEditText.setText("");
+            suggestionListAdapter.setItems(new ArrayList<>());
+            showKeyboardSearch();
        });

        TooltipCompat.setTooltipText(searchClear, getString(R.string.clear));

-        searchEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
+            }
+            if(FireTvUtils.isFireTv()){
+                showKeyboardSearch();
            }
        });

-        searchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
-                if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
+            if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
+            if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
            }
        });

        suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() {
            @Override
            public void onSuggestionItemSelected(SuggestionItem item) {
-                search(item.query);
+                search(item.query, new String[0], "");
                searchEditText.setText(item.query);
            }

@@ -469,21 +519,24 @@ public class SearchFragment
            }
        };
        searchEditText.addTextChangedListener(textWatcher);
-        searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (DEBUG) {
-                    Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
-                }
-                if (event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
-                    search(searchEditText.getText().toString());
-                    return true;
-                }
-                return false;
-            }
-        });
+        searchEditText.setOnEditorActionListener(
+                (TextView v, int actionId, KeyEvent event) -> {
+                    if (DEBUG) {
+                        Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
+                    }
+                    if(actionId == EditorInfo.IME_ACTION_PREVIOUS){
+                        hideKeyboardSearch();
+                    } else if (event != null
+                            && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+                                || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
+                        search(searchEditText.getText().toString(), new String[0], "");
+                        return true;
+                    }
+                    return false;
+                });

-        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
+        if (suggestionDisposable == null || suggestionDisposable.isDisposed())
+            initSuggestionObserver();
    }

    private void unsetSearchListeners() {
@@ -513,8 +566,9 @@ public class SearchFragment
        if (searchEditText == null) return;

        if (searchEditText.requestFocus()) {
-            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                    Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_FORCED);
        }
    }

@@ -522,8 +576,9 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "hideKeyboardSearch() called");
        if (searchEditText == null) return;

-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), InputMethodManager.RESULT_UNCHANGED_SHOWN);

        searchEditText.clearFocus();
    }
@@ -544,9 +599,8 @@ public class SearchFragment
                                    howManyDeleted -> suggestionPublisher
                                            .onNext(searchEditText.getText().toString()),
                                    throwable -> showSnackBarError(throwable,
-                                            UserAction.SOMETHING_ELSE, "none",
-                                            "Deleting item failed", R.string.general_error)
-                            );
+                                            UserAction.DELETE_FROM_HISTORY, "none",
+                                            "Deleting item failed", R.string.general_error));
                    disposables.add(onDelete);
                })
                .show();
@@ -554,10 +608,12 @@ public class SearchFragment

    @Override
    public boolean onBackPressed() {
-        if (suggestionsPanel.getVisibility() == View.VISIBLE && infoListAdapter.getItemsList().size() > 0 && !isLoading.get()) {
+        if (suggestionsPanel.getVisibility() == View.VISIBLE
+                && infoListAdapter.getItemsList().size() > 0
+                && !isLoading.get()) {
            hideSuggestionsPanel();
            hideKeyboardSearch();
-            searchEditText.setText(lastSearchedQuery);
+            searchEditText.setText(lastSearchedString);
            return true;
        }
        return false;
@@ -573,8 +629,10 @@ public class SearchFragment

        final Observable<String> observable = suggestionPublisher
                .debounce(SUGGESTIONS_DEBOUNCE, TimeUnit.MILLISECONDS)
-                .startWith(searchQuery != null ? searchQuery : "")
-                .filter(query -> isSuggestionsEnabled);
+                .startWith(searchString != null
+                        ? searchString
+                        : "")
+                .filter(searchString -> isSuggestionsEnabled);

        suggestionDisposable = observable
                .switchMap(query -> {
@@ -594,7 +652,7 @@ public class SearchFragment
                    }

                    final Observable<List<SuggestionItem>> network = ExtractorHelper
-                            .suggestionsFor(serviceId, query, contentCountry)
+                            .suggestionsFor(serviceId, query)
                            .toObservable()
                            .map(strings -> {
                                List<SuggestionItem> result = new ArrayList<>();
@@ -645,56 +703,44 @@ public class SearchFragment
        // no-op
    }

-    private void search(final String query) {
-        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "]");
-        if (query.isEmpty()) return;
+    private void search(final String searchString, String[] contentFilter, String sortFilter) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + searchString + "]");
+        if (searchString.isEmpty()) return;

        try {
-            final StreamingService service = NewPipe.getServiceByUrl(query);
+            final StreamingService service = NewPipe.getServiceByUrl(searchString);
            if (service != null) {
                showLoading();
                disposables.add(Observable
-                        .fromCallable(new Callable<Intent>() {
-                            @Override
-                            public Intent call() throws Exception {
-                                return NavigationHelper.getIntentByLink(activity, service, query);
-                            }
-                        })
+                        .fromCallable(() ->
+                                NavigationHelper.getIntentByLink(activity, service, searchString))
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new Consumer<Intent>() {
-                            @Override
-                            public void accept(Intent intent) throws Exception {
-                                getFragmentManager().popBackStackImmediate();
-                                activity.startActivity(intent);
-                            }
-                        }, new Consumer<Throwable>() {
-                            @Override
-                            public void accept(Throwable throwable) throws Exception {
-                                showError(getString(R.string.url_not_supported_toast), false);
-                            }
-                        }));
+                        .subscribe(intent -> {
+                            getFragmentManager().popBackStackImmediate();
+                            activity.startActivity(intent);
+                        }, throwable ->
+                                showError(getString(R.string.url_not_supported_toast), false)));
                return;
            }
        } catch (Exception e) {
            // Exception occurred, it's not a url
        }

-        lastSearchedQuery = query;
-        searchQuery = query;
-        currentPage = 0;
+        lastSearchedString = this.searchString;
+        this.searchString = searchString;
        infoListAdapter.clearStreamItemList();
        hideSuggestionsPanel();
        hideKeyboardSearch();

-        historyRecordManager.onSearched(serviceId, query)
+        historyRecordManager.onSearched(serviceId, searchString)
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(
                        ignored -> {},
                        error -> showSnackBarError(error, UserAction.SEARCHED,
-                                NewPipe.getNameOfService(serviceId), query, 0)
+                                NewPipe.getNameOfService(serviceId), searchString, 0)
                );
-        suggestionPublisher.onNext(query);
+        suggestionPublisher.onNext(searchString);
        startLoading(false);
    }

@@ -703,20 +749,29 @@ public class SearchFragment
        super.startLoading(forceLoad);
        if (disposables != null) disposables.clear();
        if (searchDisposable != null) searchDisposable.dispose();
-        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.searchFor(serviceId,
+                    searchString,
+                    Arrays.asList(contentFilter),
+                    sortFilter)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .doOnEvent((searchResult, throwable) -> isLoading.set(false))
                .subscribe(this::handleResult, this::onError);
+
    }

    @Override
    protected void loadMoreItems() {
+        if(nextPageUrl == null || nextPageUrl.isEmpty()) return;
        isLoading.set(true);
        showListFooter(true);
        if (searchDisposable != null) searchDisposable.dispose();
-        currentNextPage = currentPage + 1;
-        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.getMoreSearchItems(
+                    serviceId,
+                    searchString,
+                    asList(contentFilter),
+                    sortFilter,
+                    nextPageUrl)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .doOnEvent((nextItemsResult, throwable) -> isLoading.set(false))
@@ -739,19 +794,22 @@ public class SearchFragment
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

-    private void changeFilter(MenuItem item, SearchEngine.Filter filter) {
-        this.filter = filter;
+    private void changeContentFilter(MenuItem item, List<String> contentFilter) {
        this.filterItemCheckedId = item.getItemId();
        item.setChecked(true);

-        if (!TextUtils.isEmpty(searchQuery)) {
-            search(searchQuery);
+        this.contentFilter = new String[] {contentFilter.get(0)};
+
+        if (!TextUtils.isEmpty(searchString)) {
+            search(searchString, this.contentFilter, sortFilter);
        }
    }

-    private void setQuery(int serviceId, String searchQuery) {
+    private void setQuery(int serviceId, String searchString, String[] contentfilter, String sortFilter) {
        this.serviceId = serviceId;
-        this.searchQuery = searchQuery;
+        this.searchString = searchString;
+        this.contentFilter = contentfilter;
+        this.sortFilter = sortFilter;
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -772,8 +830,11 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "onSuggestionError() called with: exception = [" + exception + "]");
        if (super.onError(exception)) return;

-        int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+        int errorId = exception instanceof ParsingException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS,
+                NewPipe.getNameOfService(serviceId), searchString, errorId);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -798,16 +859,22 @@ public class SearchFragment
    //////////////////////////////////////////////////////////////////////////*/

    @Override
-    public void handleResult(@NonNull SearchResult result) {
-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, 0);
+    public void handleResult(@NonNull SearchInfo result) {
+        final List<Throwable> exceptions = result.getErrors();
+        if (!exceptions.isEmpty()
+            && !(exceptions.size() == 1
+                && exceptions.get(0) instanceof SearchExtractor.NothingFoundException)){
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, 0);
        }

-        lastSearchedQuery = searchQuery;
+        lastSearchedString = searchString;
+        nextPageUrl = result.getNextPageUrl();
+        currentPageUrl = result.getUrl();

        if (infoListAdapter.getItemsList().size() == 0) {
-            if (!result.getResults().isEmpty()) {
-                infoListAdapter.addInfoItemList(result.getResults());
+            if (!result.getRelatedItems().isEmpty()) {
+                infoListAdapter.addInfoItemList(result.getRelatedItems());
            } else {
                infoListAdapter.clearStreamItemList();
                showEmptyState();
@@ -821,12 +888,14 @@ public class SearchFragment
    @Override
    public void handleNextItems(ListExtractor.InfoItemsPage result) {
        showListFooter(false);
-        currentPage = Integer.parseInt(result.getNextPageUrl());
+        currentPageUrl = result.getNextPageUrl();
        infoListAdapter.addInfoItemList(result.getItems());
+        nextPageUrl = result.getNextPageUrl();

        if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
-                    , "\"" + searchQuery + "\" → page " + currentPage, 0);
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId)
+                    , "\"" + searchString + "\" → page: " + nextPageUrl, 0);
        }
        super.handleNextItems(result);
    }
@@ -835,14 +904,41 @@ public class SearchFragment
    protected boolean onError(Throwable exception) {
        if (super.onError(exception)) return true;

-        if (exception instanceof SearchEngine.NothingFoundException) {
+        if (exception instanceof SearchExtractor.NothingFoundException) {
            infoListAdapter.clearStreamItemList();
            showEmptyState();
        } else {
-            int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-            onUnrecoverableError(exception, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+            int errorId = exception instanceof ParsingException
+                    ? R.string.parsing_error
+                    : R.string.general_error;
+            onUnrecoverableError(exception, UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, errorId);
        }

        return true;
    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Suggestion item touch helper
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public int getSuggestionMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
+        final int position = viewHolder.getAdapterPosition();
+        final SuggestionItem item = suggestionListAdapter.getItem(position);
+        return item.fromHistory ? makeMovementFlags(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) : 0;
+    }
+
+    public void onSuggestionItemSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+        final int position = viewHolder.getAdapterPosition();
+        final String query = suggestionListAdapter.getItem(position).query;
+        final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        howManyDeleted -> suggestionPublisher
+                                .onNext(searchEditText.getText().toString()),
+                        throwable -> showSnackBarError(throwable,
+                                UserAction.DELETE_FROM_HISTORY, "none",
+                                "Deleting item failed", R.string.general_error));
+        disposables.add(onDelete);
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
@@ -63,28 +63,19 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
    public void onBindViewHolder(SuggestionItemHolder holder, int position) {
        final SuggestionItem currentItem = getItem(position);
        holder.updateFrom(currentItem);
-        holder.queryView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemSelected(currentItem);
-            }
+        holder.queryView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemSelected(currentItem);
        });
-        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+        holder.queryView.setOnLongClickListener(v -> {
                if (listener != null) listener.onSuggestionItemLongClick(currentItem);
                return true;
-            }
        });
-        holder.insertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemInserted(currentItem);
-            }
+        holder.insertView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemInserted(currentItem);
        });
    }

-    private SuggestionItem getItem(int position) {
+    SuggestionItem getItem(int position) {
        return items.get(position);
    }

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@@ -0,0 +1,208 @@
+package org.schabi.newpipe.fragments.list.videos;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.RelatedStreamInfo;
+
+import java.io.Serializable;
+
+import io.reactivex.Single;
+import io.reactivex.disposables.CompositeDisposable;
+
+public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInfo> implements SharedPreferences.OnSharedPreferenceChangeListener{
+
+    private CompositeDisposable disposables = new CompositeDisposable();
+    private RelatedStreamInfo relatedStreamInfo;
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+    private View headerRootLayout;
+    private Switch aSwitch;
+
+    private boolean mIsVisibleToUser = false;
+
+    public static RelatedVideosFragment getInstance(StreamInfo info) {
+        RelatedVideosFragment instance = new RelatedVideosFragment();
+        instance.setInitialData(info);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_related_streams, container, false);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (disposables != null) disposables.clear();
+    }
+
+    protected View getListHeader(){
+        if(relatedStreamInfo != null && relatedStreamInfo.getNextStream() != null){
+            headerRootLayout = activity.getLayoutInflater().inflate(R.layout.related_streams_header, itemsList, false);
+            aSwitch = headerRootLayout.findViewById(R.id.autoplay_switch);
+
+            SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getContext());
+            Boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
+            aSwitch.setChecked(autoplay);
+            aSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    SharedPreferences.Editor prefEdit = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
+                    prefEdit.putBoolean(getString(R.string.auto_queue_key), b);
+                    prefEdit.apply();
+                }
+            });
+            return headerRootLayout;
+        }else{
+            return null;
+        }
+    }
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return Single.fromCallable(() -> ListExtractor.InfoItemsPage.emptyPage());
+    }
+
+    @Override
+    protected Single<RelatedStreamInfo> loadResult(boolean forceLoad) {
+        return Single.fromCallable(() -> relatedStreamInfo);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        if(null != headerRootLayout) headerRootLayout.setVisibility(View.INVISIBLE);
+    }
+
+    @Override
+    public void handleResult(@NonNull RelatedStreamInfo result) {
+
+        super.handleResult(result);
+
+        if(null != headerRootLayout) headerRootLayout.setVisibility(View.VISIBLE);
+        AnimationUtils.slideUp(getView(),120, 96, 0.06f);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_STREAM, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+
+        if (disposables != null) disposables.clear();
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        super.handleNextItems(result);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_STREAM,
+                    NewPipe.getNameOfService(serviceId),
+                    "Get next page of: " + url,
+                    R.string.general_error);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnError
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        if (super.onError(exception)) return true;
+
+        hideLoading();
+        showSnackBarError(exception, UserAction.REQUESTED_STREAM, NewPipe.getNameOfService(serviceId), url, R.string.general_error);
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(String title) {
+        return;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        return;
+    }
+
+    private void setInitialData(StreamInfo info) {
+        super.setInitialData(info.getServiceId(), info.getUrl(), info.getName());
+        if(this.relatedStreamInfo == null) this.relatedStreamInfo = RelatedStreamInfo.getInfo(info);
+    }
+
+
+    private static final String INFO_KEY = "related_info_key";
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putSerializable(INFO_KEY, relatedStreamInfo);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull Bundle savedState) {
+        super.onRestoreInstanceState(savedState);
+        if (savedState != null) {
+            Serializable serializable = savedState.getSerializable(INFO_KEY);
+            if(serializable instanceof RelatedStreamInfo){
+                this.relatedStreamInfo = (RelatedStreamInfo) serializable;
+            }
+        }
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getContext());
+        Boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
+        if(null != aSwitch) aSwitch.setChecked(autoplay);
+    }
+
+    @Override
+    protected boolean isGridLayout() {
+        return false;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/LastPlayedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/LastPlayedFragment.java
@@ -1,21 +0,0 @@
-package org.schabi.newpipe.fragments.local.bookmark;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-
-import java.util.Collections;
-import java.util.List;
-
-public final class LastPlayedFragment extends StatisticsPlaylistFragment {
-    @Override
-    protected String getName() {
-        return getString(R.string.title_last_played);
-    }
-
-    @Override
-    protected List<StreamStatisticsEntry> processResult(List<StreamStatisticsEntry> results)  {
-        Collections.sort(results, (left, right) ->
-                right.latestAccessDate.compareTo(left.latestAccessDate));
-        return results;
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/MostPlayedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/MostPlayedFragment.java
@@ -1,22 +0,0 @@
-package org.schabi.newpipe.fragments.local.bookmark;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-
-import java.util.Collections;
-import java.util.List;
-
-public final class MostPlayedFragment extends StatisticsPlaylistFragment {
-    @Override
-    protected String getName() {
-        return getString(R.string.title_most_played);
-    }
-
-    @Override
-    protected List<StreamStatisticsEntry> processResult(List<StreamStatisticsEntry> results)  {
-        Collections.sort(results, (left, right) ->
-                ((Long) right.watchCount).compareTo(left.watchCount));
-        return results;
-    }
-
-}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
@@ -1,300 +0,0 @@
-package org.schabi.newpipe.fragments.local.bookmark;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.history.HistoryRecordManager;
-import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
-import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.OnClickGesture;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import icepick.State;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-
-public abstract class StatisticsPlaylistFragment
-        extends BaseLocalListFragment<List<StreamStatisticsEntry>, Void> {
-
-    private View headerPlayAllButton;
-    private View headerPopupButton;
-    private View headerBackgroundButton;
-
-    @State
-    protected Parcelable itemsListState;
-
-    /* Used for independent events */
-    private Subscription databaseSubscription;
-    private HistoryRecordManager recordManager;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Abstracts
-    ///////////////////////////////////////////////////////////////////////////
-
-    protected abstract String getName();
-
-    protected abstract List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fragment LifeCycle - Creation
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        recordManager = new HistoryRecordManager(getContext());
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_playlist, container, false);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fragment LifeCycle - Views
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void initViews(View rootView, Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
-        setTitle(getName());
-    }
-
-    @Override
-    protected View getListHeader() {
-        final View headerRootLayout = activity.getLayoutInflater().inflate(R.layout.playlist_control,
-                itemsList, false);
-        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
-        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
-        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
-        return headerRootLayout;
-    }
-
-    @Override
-    protected void initListeners() {
-        super.initListeners();
-
-        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
-            @Override
-            public void selected(LocalItem selectedItem) {
-                if (selectedItem instanceof StreamStatisticsEntry) {
-                    final StreamStatisticsEntry item = (StreamStatisticsEntry) selectedItem;
-                    NavigationHelper.openVideoDetailFragment(getFragmentManager(),
-                            item.serviceId, item.url, item.title);
-                }
-            }
-
-            @Override
-            public void held(LocalItem selectedItem) {
-                if (selectedItem instanceof StreamStatisticsEntry) {
-                    showStreamDialog((StreamStatisticsEntry) selectedItem);
-                }
-            }
-        });
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fragment LifeCycle - Loading
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void startLoading(boolean forceLoad) {
-        super.startLoading(forceLoad);
-        recordManager.getStreamStatistics()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(getHistoryObserver());
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fragment LifeCycle - Destruction
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        if (itemListAdapter != null) itemListAdapter.unsetSelectedListener();
-        if (headerBackgroundButton != null) headerBackgroundButton.setOnClickListener(null);
-        if (headerPlayAllButton != null) headerPlayAllButton.setOnClickListener(null);
-        if (headerPopupButton != null) headerPopupButton.setOnClickListener(null);
-
-        if (databaseSubscription != null) databaseSubscription.cancel();
-        databaseSubscription = null;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        recordManager = null;
-        itemsListState = null;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Statistics Loader
-    ///////////////////////////////////////////////////////////////////////////
-
-    private Subscriber<List<StreamStatisticsEntry>> getHistoryObserver() {
-        return new Subscriber<List<StreamStatisticsEntry>>() {
-            @Override
-            public void onSubscribe(Subscription s) {
-                showLoading();
-
-                if (databaseSubscription != null) databaseSubscription.cancel();
-                databaseSubscription = s;
-                databaseSubscription.request(1);
-            }
-
-            @Override
-            public void onNext(List<StreamStatisticsEntry> streams) {
-                handleResult(streams);
-                if (databaseSubscription != null) databaseSubscription.request(1);
-            }
-
-            @Override
-            public void onError(Throwable exception) {
-                StatisticsPlaylistFragment.this.onError(exception);
-            }
-
-            @Override
-            public void onComplete() {
-            }
-        };
-    }
-
-    @Override
-    public void handleResult(@NonNull List<StreamStatisticsEntry> result) {
-        super.handleResult(result);
-        if (itemListAdapter == null) return;
-
-        itemListAdapter.clearStreamItemList();
-
-        if (result.isEmpty()) {
-            showEmptyState();
-            return;
-        }
-
-        itemListAdapter.addItems(processResult(result));
-        if (itemsListState != null) {
-            itemsList.getLayoutManager().onRestoreInstanceState(itemsListState);
-            itemsListState = null;
-        }
-
-        headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
-        headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
-        headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
-
-        hideLoading();
-    }
-    ///////////////////////////////////////////////////////////////////////////
-    // Fragment Error Handling
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void resetFragment() {
-        super.resetFragment();
-        if (databaseSubscription != null) databaseSubscription.cancel();
-    }
-
-    @Override
-    protected boolean onError(Throwable exception) {
-        if (super.onError(exception)) return true;
-
-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE,
-                "none", "History Statistics", R.string.general_error);
-        return true;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void showStreamDialog(final StreamStatisticsEntry item) {
-        final Context context = getContext();
-        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || getActivity() == null) return;
-        final StreamInfoItem infoItem = item.toStreamInfoItem();
-
-        final String[] commands = new String[]{
-                context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.start_here_on_main),
-                context.getResources().getString(R.string.start_here_on_background),
-                context.getResources().getString(R.string.start_here_on_popup),
-        };
-
-        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
-            final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0);
-            switch (i) {
-                case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem));
-                    break;
-                case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(infoItem));
-                    break;
-                case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                    break;
-                case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                    break;
-                case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                    break;
-                default:
-                    break;
-            }
-        };
-
-        new InfoItemDialog(getActivity(), infoItem, commands, actions).show();
-    }
-
-    private PlayQueue getPlayQueue() {
-        return getPlayQueue(0);
-    }
-
-    private PlayQueue getPlayQueue(final int index) {
-        if (itemListAdapter == null) {
-            return new SinglePlayQueue(Collections.emptyList(), 0);
-        }
-
-        final List<LocalItem> infoItems = itemListAdapter.getItemsList();
-        List<StreamInfoItem> streamInfoItems = new ArrayList<>(infoItems.size());
-        for (final LocalItem item : infoItems) {
-            if (item instanceof StreamStatisticsEntry) {
-                streamInfoItems.add(((StreamStatisticsEntry) item).toStreamInfoItem());
-            }
-        }
-        return new SinglePlayQueue(streamInfoItems, index);
-    }
-}
-
--- a/app/src/main/java/org/schabi/newpipe/history/HistoryActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/history/HistoryActivity.java
@@ -1,141 +0,0 @@
-package org.schabi.newpipe.history;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.jakewharton.rxbinding2.view.RxView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.ThemeHelper;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-
-public class HistoryActivity extends AppCompatActivity {
-
-    private static final String TAG = "HistoryActivity";
-    /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
-     * fragments for each of the sections. We use a
-     * {@link FragmentPagerAdapter} derivative, which will keep every
-     * loaded fragment in memory. If this becomes too memory intensive, it
-     * may be best to switch to a
-     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
-     */
-    private SectionsPagerAdapter mSectionsPagerAdapter;
-
-    /**
-     * The {@link ViewPager} that will host the section contents.
-     */
-    private ViewPager mViewPager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.setTheme(this);
-        setContentView(R.layout.activity_history);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setTitle(R.string.title_activity_history);
-        }
-        // Create the adapter that will return a fragment for each of the three
-        // primary sections of the activity.
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
-
-        // Set up the ViewPager with the sections adapter.
-        mViewPager = findViewById(R.id.container);
-        mViewPager.setAdapter(mSectionsPagerAdapter);
-
-        TabLayout tabLayout = findViewById(R.id.tabs);
-        tabLayout.setupWithViewPager(mViewPager);
-
-        final FloatingActionButton fab = findViewById(R.id.fab);
-        RxView.clicks(fab)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(ignored -> {
-                    int currentItem = mViewPager.getCurrentItem();
-                    HistoryFragment fragment = (HistoryFragment) mSectionsPagerAdapter
-                            .instantiateItem(mViewPager, currentItem);
-                    fragment.onHistoryCleared();
-                });
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_history, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.action_settings:
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
-     * one of the sections/tabs/pages.
-     */
-    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
-
-        public SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            Fragment fragment;
-            switch (position) {
-                case 0:
-                    fragment = SearchHistoryFragment.newInstance();
-                    break;
-                case 1:
-                    fragment = WatchHistoryFragment.newInstance();
-                    break;
-                default:
-                    throw new IllegalArgumentException("position: " + position);
-            }
-            return fragment;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.title_history_search);
-                case 1:
-                    return getString(R.string.title_history_view);
-            }
-            throw new IllegalArgumentException("position: " + position);
-        }
-
-        @Override
-        public int getCount() {
-            // Show 3 total pages.
-            return 2;
-        }
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java
@@ -1,286 +0,0 @@
-package org.schabi.newpipe.history;
-
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.preference.PreferenceManager;
-import android.support.annotation.CallSuper;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-import org.schabi.newpipe.BaseFragment;
-import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import icepick.State;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-
-public abstract class HistoryFragment<E> extends BaseFragment
-        implements HistoryEntryAdapter.OnHistoryItemClickListener<E> {
-
-    private SharedPreferences mSharedPreferences;
-    private String mHistoryIsEnabledKey;
-    private boolean mHistoryIsEnabled;
-    private HistoryIsEnabledChangeListener mHistoryIsEnabledChangeListener;
-
-    private View mDisabledView;
-    private View mEmptyHistoryView;
-
-    @State
-    Parcelable mRecyclerViewState;
-    private RecyclerView mRecyclerView;
-    private HistoryEntryAdapter<E, ? extends RecyclerView.ViewHolder> mHistoryAdapter;
-
-    private Subscription historySubscription;
-
-    protected HistoryRecordManager historyRecordManager;
-    protected CompositeDisposable disposables;
-
-    @StringRes
-    abstract int getEnabledConfigKey();
-
-    @CallSuper
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mHistoryIsEnabledKey = getString(getEnabledConfigKey());
-
-        mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
-        // Read history enabled from preferences
-        mHistoryIsEnabled = isHistoryEnabled();
-        // Register history enabled listener
-        mSharedPreferences.registerOnSharedPreferenceChangeListener(mHistoryIsEnabledChangeListener);
-
-        historyRecordManager = new HistoryRecordManager(getContext());
-        disposables = new CompositeDisposable();
-    }
-
-    @NonNull
-    protected abstract HistoryEntryAdapter<E, ? extends RecyclerView.ViewHolder> createAdapter();
-
-    protected abstract Single<List<Long>> insert(final Collection<E> entries);
-
-    protected abstract Single<Integer> delete(final Collection<E> entries);
-
-    @NonNull
-    protected abstract Flowable<List<E>> getAll();
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        getAll().observeOn(AndroidSchedulers.mainThread()).subscribe(getHistorySubscriber());
-
-        final boolean newEnabled = isHistoryEnabled();
-        if (newEnabled != mHistoryIsEnabled) {
-            onHistoryIsEnabledChanged(newEnabled);
-        }
-    }
-
-    @NonNull
-    private Subscriber<List<E>> getHistorySubscriber() {
-        return new Subscriber<List<E>>() {
-            @Override
-            public void onSubscribe(Subscription s) {
-                if (historySubscription != null) historySubscription.cancel();
-
-                historySubscription = s;
-                historySubscription.request(1);
-            }
-
-            @Override
-            public void onNext(List<E> entries) {
-                if (!entries.isEmpty()) {
-                    mHistoryAdapter.setEntries(entries);
-                    animateView(mEmptyHistoryView, false, 200);
-
-                    if (mRecyclerViewState != null) {
-                        mRecyclerView.getLayoutManager().onRestoreInstanceState(mRecyclerViewState);
-                        mRecyclerViewState = null;
-                    }
-                } else {
-                    mHistoryAdapter.clear();
-                    showEmptyHistory();
-                }
-
-                if (historySubscription != null) historySubscription.request(1);
-            }
-
-            @Override
-            public void onError(Throwable t) {
-
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        };
-    }
-
-    private boolean isHistoryEnabled() {
-        return mSharedPreferences.getBoolean(mHistoryIsEnabledKey, false);
-    }
-
-    /**
-     * Called when the history is cleared to update the views
-     */
-    @MainThread
-    public void onHistoryCleared() {
-        if (getContext() == null) return;
-
-        new AlertDialog.Builder(getContext())
-                .setTitle(R.string.delete_all)
-                .setMessage(R.string.delete_all_history_prompt)
-                .setCancelable(true)
-                .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete_all, (dialog, i) -> clearHistory())
-                .show();
-    }
-
-    protected void makeSnackbar(@StringRes final int text) {
-        if (getActivity() == null) return;
-
-        View view = getActivity().findViewById(R.id.main_content);
-        if (view == null) view = mRecyclerView.getRootView();
-        Snackbar.make(view, text, Snackbar.LENGTH_LONG).show();
-    }
-
-    private void clearHistory() {
-        final Collection<E> itemsToDelete = new ArrayList<>(mHistoryAdapter.getItems());
-
-        final Disposable deletion = delete(itemsToDelete)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        ignored -> Log.d(TAG, "Clear history deleted [" +
-                        itemsToDelete.size() + "] items."),
-                        error -> Log.e(TAG, "Clear history delete step failed", error)
-                );
-
-        final Disposable cleanUp = historyRecordManager.removeOrphanedRecords()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        ignored -> Log.d(TAG, "Clear history deleted orphaned stream records"),
-                        error -> Log.e(TAG, "Clear history remove orphaned records failed", error)
-                );
-
-        disposables.addAll(deletion, cleanUp);
-
-        makeSnackbar(R.string.history_cleared);
-        mHistoryAdapter.clear();
-        showEmptyHistory();
-    }
-
-    private void showEmptyHistory() {
-        if (mHistoryIsEnabled) {
-            animateView(mEmptyHistoryView, true, 200);
-        }
-    }
-
-    @Nullable
-    @CallSuper
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_history, container, false);
-        mRecyclerView = rootView.findViewById(R.id.history_view);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext(),
-                LinearLayoutManager.VERTICAL, false);
-        mRecyclerView.setLayoutManager(layoutManager);
-
-        mHistoryAdapter = createAdapter();
-        mHistoryAdapter.setOnHistoryItemClickListener(this);
-        mRecyclerView.setAdapter(mHistoryAdapter);
-        mDisabledView = rootView.findViewById(R.id.history_disabled_view);
-        mEmptyHistoryView = rootView.findViewById(R.id.history_empty);
-
-        if (mHistoryIsEnabled) {
-            mRecyclerView.setVisibility(View.VISIBLE);
-        } else {
-            mRecyclerView.setVisibility(View.GONE);
-            mDisabledView.setVisibility(View.VISIBLE);
-        }
-
-        return rootView;
-    }
-
-    @CallSuper
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        if (disposables != null) disposables.dispose();
-        if (historySubscription != null) historySubscription.cancel();
-
-        mSharedPreferences.unregisterOnSharedPreferenceChangeListener(mHistoryIsEnabledChangeListener);
-        mSharedPreferences = null;
-        mHistoryIsEnabledChangeListener = null;
-        mHistoryIsEnabledKey = null;
-        historySubscription = null;
-        disposables = null;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mRecyclerViewState = mRecyclerView.getLayoutManager().onSaveInstanceState();
-    }
-
-    /**
-     * Called when history enabled flag is changed.
-     *
-     * @param historyIsEnabled the new value
-     */
-    @CallSuper
-    public void onHistoryIsEnabledChanged(boolean historyIsEnabled) {
-        mHistoryIsEnabled = historyIsEnabled;
-        if (historyIsEnabled) {
-            animateView(mRecyclerView, true, 300);
-            animateView(mDisabledView, false, 300);
-            if (mHistoryAdapter.isEmpty()) {
-                animateView(mEmptyHistoryView, true, 300);
-            }
-        } else {
-            animateView(mRecyclerView, false, 300);
-            animateView(mDisabledView, true, 300);
-            animateView(mEmptyHistoryView, false, 300);
-        }
-    }
-
-    private class HistoryIsEnabledChangeListener
-            implements SharedPreferences.OnSharedPreferenceChangeListener {
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (key.equals(mHistoryIsEnabledKey)) {
-                boolean enabled = sharedPreferences.getBoolean(key, false);
-                if (mHistoryIsEnabled != enabled) {
-                    onHistoryIsEnabledChanged(enabled);
-                }
-            }
-        }
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java
@@ -1,145 +0,0 @@
-package org.schabi.newpipe.history;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
-public class SearchHistoryFragment extends HistoryFragment<SearchHistoryEntry> {
-
-    @NonNull
-    public static SearchHistoryFragment newInstance() {
-        return new SearchHistoryFragment();
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @NonNull
-    @Override
-    protected SearchHistoryAdapter createAdapter() {
-        return new SearchHistoryAdapter(getContext());
-    }
-
-    @Override
-    protected Single<List<Long>> insert(Collection<SearchHistoryEntry> entries) {
-        return historyRecordManager.insertSearches(entries);
-    }
-
-    @Override
-    protected Single<Integer> delete(Collection<SearchHistoryEntry> entries) {
-        return historyRecordManager.deleteSearches(entries);
-    }
-
-    @NonNull
-    @Override
-    protected Flowable<List<SearchHistoryEntry>> getAll() {
-        return historyRecordManager.getSearchHistory();
-    }
-
-    @StringRes
-    @Override
-    int getEnabledConfigKey() {
-        return R.string.enable_search_history_key;
-    }
-
-    @Override
-    public void onHistoryItemClick(final SearchHistoryEntry historyItem) {
-        NavigationHelper.openSearch(getContext(), historyItem.getServiceId(),
-                historyItem.getSearch());
-    }
-
-    @Override
-    public void onHistoryItemLongClick(final SearchHistoryEntry item) {
-        if (activity == null) return;
-
-        new AlertDialog.Builder(activity)
-                .setTitle(item.getSearch())
-                .setMessage(R.string.delete_item_search_history)
-                .setCancelable(true)
-                .setNeutralButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete_one, (dialog, i) -> {
-                    final Disposable onDelete = historyRecordManager
-                            .deleteSearches(Collections.singleton(item))
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Search history Delete One failed:", error)
-                            );
-                    disposables.add(onDelete);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .setNegativeButton(R.string.delete_all, (dialog, i) -> {
-                    final Disposable onDeleteAll = historyRecordManager
-                            .deleteSearchHistory(item.getSearch())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Search history Delete All failed:", error)
-                            );
-                    disposables.add(onDeleteAll);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .show();
-    }
-
-    private static class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView search;
-        private final TextView info;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            search = itemView.findViewById(R.id.search);
-            info = itemView.findViewById(R.id.info);
-        }
-    }
-
-    protected class SearchHistoryAdapter extends HistoryEntryAdapter<SearchHistoryEntry, ViewHolder> {
-
-        SearchHistoryAdapter(Context context) {
-            super(context);
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-            View rootView = inflater.inflate(R.layout.item_search_history, parent, false);
-            return new ViewHolder(rootView);
-        }
-
-        @Override
-        void onBindViewHolder(ViewHolder holder, SearchHistoryEntry entry, int position) {
-            holder.search.setText(entry.getSearch());
-
-            final String info = Localization.concatenateStrings(
-                    getFormattedDate(entry.getCreationDate()),
-                    NewPipe.getNameOfService(entry.getServiceId()));
-            holder.info.setText(info);
-        }
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/history/WatchHistoryFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/history/WatchHistoryFragment.java
@@ -1,171 +0,0 @@
-package org.schabi.newpipe.history;
-
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.nostra13.universalimageloader.core.ImageLoader;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
-import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
-
-public class WatchHistoryFragment extends HistoryFragment<StreamHistoryEntry> {
-
-    @NonNull
-    public static WatchHistoryFragment newInstance() {
-        return new WatchHistoryFragment();
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @StringRes
-    @Override
-    int getEnabledConfigKey() {
-        return R.string.enable_watch_history_key;
-    }
-
-    @NonNull
-    @Override
-    protected StreamHistoryAdapter createAdapter() {
-        return new StreamHistoryAdapter(getContext());
-    }
-
-    @Override
-    protected Single<List<Long>> insert(Collection<StreamHistoryEntry> entries) {
-        return historyRecordManager.insertStreamHistory(entries);
-    }
-
-    @Override
-    protected Single<Integer> delete(Collection<StreamHistoryEntry> entries) {
-        return historyRecordManager.deleteStreamHistory(entries);
-    }
-
-    @NonNull
-    @Override
-    protected Flowable<List<StreamHistoryEntry>> getAll() {
-        return historyRecordManager.getStreamHistory();
-    }
-
-    @Override
-    public void onHistoryItemClick(StreamHistoryEntry historyItem) {
-        NavigationHelper.openVideoDetail(getContext(), historyItem.serviceId, historyItem.url,
-                historyItem.title);
-    }
-
-    @Override
-    public void onHistoryItemLongClick(StreamHistoryEntry item) {
-        new AlertDialog.Builder(activity)
-                .setTitle(item.title)
-                .setMessage(R.string.delete_stream_history_prompt)
-                .setCancelable(true)
-                .setNeutralButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete_one, (dialog, i) -> {
-                    final Disposable onDelete = historyRecordManager
-                            .deleteStreamHistory(Collections.singleton(item))
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Watch history Delete One failed:", error)
-                            );
-                    disposables.add(onDelete);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .setNegativeButton(R.string.delete_all, (dialog, i) -> {
-                    final Disposable onDeleteAll = historyRecordManager
-                            .deleteStreamHistory(item.streamId)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Watch history Delete All failed:", error)
-                            );
-                    disposables.add(onDeleteAll);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .show();
-    }
-
-    private static class StreamHistoryAdapter extends HistoryEntryAdapter<StreamHistoryEntry, ViewHolder> {
-
-        StreamHistoryAdapter(Context context) {
-            super(context);
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-            View itemView = inflater.inflate(R.layout.list_stream_item, parent, false);
-            return new ViewHolder(itemView);
-        }
-
-        @Override
-        public void onViewRecycled(ViewHolder holder) {
-            holder.itemView.setOnClickListener(null);
-            ImageLoader.getInstance()
-                    .cancelDisplayTask(holder.thumbnailView);
-        }
-
-        @Override
-        void onBindViewHolder(ViewHolder holder, StreamHistoryEntry entry, int position) {
-            final String formattedDate = getFormattedDate(entry.accessDate);
-            final String info;
-            if (entry.repeatCount > 1) {
-                info = Localization.concatenateStrings(formattedDate,
-                        getFormattedViewString(entry.repeatCount));
-            } else {
-                info = formattedDate;
-            }
-
-            holder.info.setText(info);
-            holder.streamTitle.setText(entry.title);
-            holder.uploader.setText(entry.uploader);
-            holder.duration.setText(Localization.getDurationString(entry.duration));
-            ImageLoader.getInstance().displayImage(entry.thumbnailUrl, holder.thumbnailView,
-                    ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
-        }
-    }
-
-    private static class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView info;
-        private final TextView streamTitle;
-        private final ImageView thumbnailView;
-        private final TextView uploader;
-        private final TextView duration;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            thumbnailView = itemView.findViewById(R.id.itemThumbnailView);
-            info = itemView.findViewById(R.id.itemAdditionalDetails);
-            streamTitle = itemView.findViewById(R.id.itemVideoTitleView);
-            uploader = itemView.findViewById(R.id.itemUploaderView);
-            duration = itemView.findViewById(R.id.itemDurationView);
-        }
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.info_list;

 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

@@ -10,15 +9,19 @@ import com.nostra13.universalimageloader.core.ImageLoader;

 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.OnClickGesture;

 /*
@@ -45,23 +48,25 @@ public class InfoItemBuilder {
    private static final String TAG = InfoItemBuilder.class.toString();

    private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();

    private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
    private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
    private OnClickGesture<PlaylistInfoItem> onPlaylistSelectedListener;
+    private OnClickGesture<CommentsInfoItem> onCommentsSelectedListener;

    public InfoItemBuilder(Context context) {
        this.context = context;
    }

-    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem) {
-        return buildView(parent, infoItem, false);
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        return buildView(parent, infoItem, historyRecordManager, false);
    }

-    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, boolean useMiniVariant) {
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem,
+                          final HistoryRecordManager historyRecordManager, boolean useMiniVariant) {
        InfoItemHolder holder = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
-        holder.updateFromItem(infoItem);
+        holder.updateFromItem(infoItem, historyRecordManager);
        return holder.itemView;
    }

@@ -73,8 +78,9 @@ public class InfoItemBuilder {
                return useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent) : new ChannelInfoItemHolder(this, parent);
            case PLAYLIST:
                return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent) : new PlaylistInfoItemHolder(this, parent);
+            case COMMENT:
+                return useMiniVariant ? new CommentsMiniInfoItemHolder(this, parent) : new CommentsInfoItemHolder(this, parent);
            default:
-                Log.e(TAG, "Trollolo");
                throw new RuntimeException("InfoType not expected = " + infoType.name());
        }
    }
@@ -111,4 +117,12 @@ public class InfoItemBuilder {
        this.onPlaylistSelectedListener = listener;
    }

+    public OnClickGesture<CommentsInfoItem> getOnCommentsSelectedListener() {
+        return onCommentsSelectedListener;
+    }
+
+    public void setOnCommentsSelectedListener(OnClickGesture<CommentsInfoItem> onCommentsSelectedListener) {
+        this.onCommentsSelectedListener = onCommentsSelectedListener;
+    }
+
 }
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
@@ -5,7 +5,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -1,22 +1,34 @@
 package org.schabi.newpipe.info_list;

-import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;

 import java.util.ArrayList;
@@ -51,14 +63,22 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde

    private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
    private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int GRID_STREAM_HOLDER_TYPE = 0x102;
    private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
    private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int GRID_CHANNEL_HOLDER_TYPE = 0x202;
    private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
    private static final int PLAYLIST_HOLDER_TYPE = 0x301;
+    private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
+    private static final int MINI_COMMENT_HOLDER_TYPE = 0x400;
+    private static final int COMMENT_HOLDER_TYPE = 0x401;

    private final InfoItemBuilder infoItemBuilder;
    private final ArrayList<InfoItem> infoItemList;
+    private final HistoryRecordManager recordManager;
+
    private boolean useMiniVariant = false;
+    private boolean useGridVariant = false;
    private boolean showFooter = false;
    private View header = null;
    private View footer = null;
@@ -72,8 +92,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        }
    }

-    public InfoListAdapter(Activity a) {
-        infoItemBuilder = new InfoItemBuilder(a);
+    public InfoListAdapter(Context context) {
+        this.recordManager = new HistoryRecordManager(context);
+        infoItemBuilder = new InfoItemBuilder(context);
        infoItemList = new ArrayList<>();
    }

@@ -89,54 +110,65 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        infoItemBuilder.setOnPlaylistSelectedListener(listener);
    }

+    public void setOnCommentsSelectedListener(OnClickGesture<CommentsInfoItem> listener) {
+        infoItemBuilder.setOnCommentsSelectedListener(listener);
+    }
+
    public void useMiniItemVariants(boolean useMiniVariant) {
        this.useMiniVariant = useMiniVariant;
    }

-    public void addInfoItemList(List<InfoItem> data) {
-        if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size());
-            }
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }

-            int offsetStart = sizeConsideringHeaderOffset();
-            infoItemList.addAll(data);
+    public void addInfoItemList(@Nullable final List<InfoItem> data) {
+        if (data == null) {
+            return;
+        }
+        if (DEBUG) Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " +
+                infoItemList.size() + ", data.size() = " + data.size());

-            if (DEBUG) {
-                Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
-            }
+        int offsetStart = sizeConsideringHeaderOffset();
+        infoItemList.addAll(data);

-            notifyItemRangeInserted(offsetStart, data.size());
+        if (DEBUG) Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart +
+                ", infoItemList.size() = " + infoItemList.size() +
+                ", header = " + header + ", footer = " + footer +
+                ", showFooter = " + showFooter);
+        notifyItemRangeInserted(offsetStart, data.size());

-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeaderOffset();
-                notifyItemMoved(offsetStart, footerNow);
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeaderOffset();
+            notifyItemMoved(offsetStart, footerNow);

-                if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + " to " + footerNow);
-            }
+            if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart +
+                    " to " + footerNow);
        }
    }

-    public void addInfoItem(InfoItem data) {
-        if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread());
-            }
+    public void addInfoItem(@Nullable InfoItem data) {
+        if (data == null) {
+            return;
+        }
+        if (DEBUG) Log.d(TAG, "addInfoItem() before > infoItemList.size() = " +
+                infoItemList.size() + ", thread = " + Thread.currentThread());

-            int positionInserted = sizeConsideringHeaderOffset();
-            infoItemList.add(data);
+        int positionInserted = sizeConsideringHeaderOffset();
+        infoItemList.add(data);

-            if (DEBUG) {
-                Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
-            }
-            notifyItemInserted(positionInserted);
+        if (DEBUG) Log.d(TAG, "addInfoItem() after > position = " + positionInserted +
+                ", infoItemList.size() = " + infoItemList.size() +
+                ", header = " + header + ", footer = " + footer +
+                ", showFooter = " + showFooter);
+        notifyItemInserted(positionInserted);

-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeaderOffset();
-                notifyItemMoved(positionInserted, footerNow);
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeaderOffset();
+            notifyItemMoved(positionInserted, footerNow);

-                if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + " to " + footerNow);
-            }
+            if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted +
+                    " to " + footerNow);
        }
    }

@@ -205,20 +237,23 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        final InfoItem item = infoItemList.get(position);
        switch (item.getInfoType()) {
            case STREAM:
-                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
+                return useGridVariant ? GRID_STREAM_HOLDER_TYPE : useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
            case CHANNEL:
-                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
+                return useGridVariant ? GRID_CHANNEL_HOLDER_TYPE : useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
            case PLAYLIST:
-                return useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
+                return useGridVariant ? GRID_PLAYLIST_HOLDER_TYPE : useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
+            case COMMENT:
+                return useMiniVariant ? MINI_COMMENT_HOLDER_TYPE : COMMENT_HOLDER_TYPE;
            default:
-                Log.e(TAG, "Trollolo");
                return -1;
        }
    }

+    @NonNull
    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
-        if (DEBUG) Log.d(TAG, "onCreateViewHolder() called with: parent = [" + parent + "], type = [" + type + "]");
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int type) {
+        if (DEBUG)
+            Log.d(TAG, "onCreateViewHolder() called with: parent = [" + parent + "], type = [" + type + "]");
        switch (type) {
            case HEADER_TYPE:
                return new HFHolder(header);
@@ -228,32 +263,66 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
            case STREAM_HOLDER_TYPE:
                return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
            case MINI_CHANNEL_HOLDER_TYPE:
                return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
            case CHANNEL_HOLDER_TYPE:
                return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
            case MINI_PLAYLIST_HOLDER_TYPE:
                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
            case PLAYLIST_HOLDER_TYPE:
                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
+            case MINI_COMMENT_HOLDER_TYPE:
+                return new CommentsMiniInfoItemHolder(infoItemBuilder, parent);
+            case COMMENT_HOLDER_TYPE:
+                return new CommentsInfoItemHolder(infoItemBuilder, parent);
            default:
-                Log.e(TAG, "Trollolo");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
        if (DEBUG) Log.d(TAG, "onBindViewHolder() called with: holder = [" + holder.getClass().getSimpleName() + "], position = [" + position + "]");
        if (holder instanceof InfoItemHolder) {
            // If header isn't null, offset the items by -1
            if (header != null) position--;

-            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position));
+            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), recordManager);
        } else if (holder instanceof HFHolder && position == 0 && header != null) {
            ((HFHolder) holder).view = header;
        } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset() && footer != null && showFooter) {
            ((HFHolder) holder).view = footer;
        }
    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty() && holder instanceof InfoItemHolder) {
+            for (Object payload : payloads) {
+                if (payload instanceof StreamStateEntity) {
+                    ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), recordManager);
+                } else if (payload instanceof Boolean) {
+                    ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), recordManager);
+                }
+            }
+        } else {
+            onBindViewHolder(holder, position);
+        }
+    }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class ChannelGridInfoItemHolder extends ChannelMiniInfoItemHolder {
+
+	public ChannelGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_channel_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java
@@ -7,6 +7,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.Localization;

 /*
@@ -38,8 +39,8 @@ public class ChannelInfoItemHolder extends ChannelMiniInfoItemHolder {
    }

    @Override
-    public void updateFromItem(final InfoItem infoItem) {
-        super.updateFromItem(infoItem);
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        super.updateFromItem(infoItem, historyRecordManager);

        if (!(infoItem instanceof ChannelInfoItem)) return;
        final ChannelInfoItem item = (ChannelInfoItem) infoItem;
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -7,6 +7,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;

@@ -30,7 +31,7 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
    }

    @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
        if (!(infoItem instanceof ChannelInfoItem)) return;
        final ChannelInfoItem item = (ChannelInfoItem) infoItem;

@@ -47,6 +48,13 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
                itemBuilder.getOnChannelSelectedListener().selected(item);
            }
        });
+
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().held(item);
+            }
+            return true;
+        });
    }

    protected String getDetailLine(final ChannelInfoItem item) {
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
@@ -0,0 +1,52 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+
+/*
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemHolder .java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
+
+    public final TextView itemTitleView;
+
+    public CommentsInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_comments_item, parent);
+
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        super.updateFromItem(infoItem, historyRecordManager);
+
+        if (!(infoItem instanceof CommentsInfoItem)) return;
+        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
+
+        itemTitleView.setText(item.getAuthorName());
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -0,0 +1,147 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.support.v7.app.AppCompatActivity;
+import android.text.util.Linkify;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.jsoup.helper.StringUtil;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.CommentTextOnTouchListener;
+import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.NavigationHelper;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class CommentsMiniInfoItemHolder extends InfoItemHolder {
+    public final CircleImageView itemThumbnailView;
+    private final TextView itemContentView;
+    private final TextView itemLikesCountView;
+    private final TextView itemDislikesCountView;
+    private final TextView itemPublishedTime;
+
+    private static final int commentDefaultLines = 2;
+    private static final int commentExpandedLines = 1000;
+
+    private String commentText;
+    private String streamUrl;
+
+    private static final Pattern pattern = Pattern.compile("(\\d+:)?(\\d+)?:(\\d+)");
+
+    private final Linkify.TransformFilter timestampLink = new Linkify.TransformFilter() {
+        @Override
+        public String transformUrl(Matcher match, String url) {
+            int timestamp = 0;
+            String hours = match.group(1);
+            String minutes = match.group(2);
+            String seconds = match.group(3);
+            if(hours != null) timestamp += (Integer.parseInt(hours.replace(":", ""))*3600);
+            if(minutes != null) timestamp += (Integer.parseInt(minutes.replace(":", ""))*60);
+            if(seconds != null) timestamp += (Integer.parseInt(seconds));
+            return streamUrl + url.replace(match.group(0), "#timestamp=" + timestamp);
+        }
+    };
+
+    CommentsMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
+        itemDislikesCountView = itemView.findViewById(R.id.detail_thumbs_down_count_view);
+        itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
+        itemContentView = itemView.findViewById(R.id.itemCommentContentView);
+    }
+
+    public CommentsMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        this(infoItemBuilder, R.layout.list_comments_mini_item, parent);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        if (!(infoItem instanceof CommentsInfoItem)) return;
+        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
+
+        itemBuilder.getImageLoader()
+                .displayImage(item.getAuthorThumbnail(),
+                        itemThumbnailView,
+                        ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemThumbnailView.setOnClickListener(view -> {
+            if(StringUtil.isBlank(item.getAuthorEndpoint())) return;
+            try {
+                final AppCompatActivity activity = (AppCompatActivity) itemBuilder.getContext();
+                NavigationHelper.openChannelFragment(
+                        activity.getSupportFragmentManager(),
+                        item.getServiceId(),
+                        item.getAuthorEndpoint(),
+                        item.getAuthorName());
+            } catch (Exception e) {
+                ErrorActivity.reportUiError((AppCompatActivity) itemBuilder.getContext(), e);
+            }
+        });
+
+        streamUrl = item.getUrl();
+
+        itemContentView.setLines(commentDefaultLines);
+        commentText = item.getCommentText();
+        itemContentView.setText(commentText);
+        itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE);
+
+        if (itemContentView.getLineCount() == 0) {
+            itemContentView.post(this::ellipsize);
+        } else {
+            ellipsize();
+        }
+
+        if (null != item.getLikeCount()) {
+            itemLikesCountView.setText(String.valueOf(item.getLikeCount()));
+        }
+        itemPublishedTime.setText(item.getPublishedTime());
+
+        itemView.setOnClickListener(view -> {
+            toggleEllipsize();
+            if (itemBuilder.getOnCommentsSelectedListener() != null) {
+                itemBuilder.getOnCommentsSelectedListener().selected(item);
+            }
+        });
+    }
+
+    private void ellipsize() {
+        if (itemContentView.getLineCount() > commentDefaultLines){
+            int endOfLastLine = itemContentView.getLayout().getLineEnd(commentDefaultLines - 1);
+            int end = itemContentView.getText().toString().lastIndexOf(' ', endOfLastLine -2);
+            if(end == -1) end = Math.max(endOfLastLine -2, 0);
+            String newVal = itemContentView.getText().subSequence(0, end) + " …";
+            itemContentView.setText(newVal);
+        }
+        linkify();
+    }
+
+    private void toggleEllipsize() {
+        if (itemContentView.getText().toString().equals(commentText)) {
+            if (itemContentView.getLineCount() > commentDefaultLines) ellipsize();
+        } else {
+            expand();
+        }
+    }
+
+    private void expand() {
+        itemContentView.setMaxLines(commentExpandedLines);
+        itemContentView.setText(commentText);
+        linkify();
+    }
+
+    private void linkify(){
+        Linkify.addLinks(itemContentView, Linkify.WEB_URLS);
+        Linkify.addLinks(itemContentView, pattern, null, null, timestampLink);
+        itemContentView.setMovementMethod(null);
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;

 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;

 /*
 * Created by Christian Schabesberger on 12.02.17.
@@ -35,5 +36,8 @@ public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
        this.itemBuilder = infoItemBuilder;
    }

-    public abstract void updateFromItem(final InfoItem infoItem);
+    public abstract void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager);
+
+    public void updateState(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+	public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java
@@ -8,6 +8,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.ImageDisplayConstants;

 public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
@@ -30,7 +31,7 @@ public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
    }

    @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
        if (!(infoItem instanceof PlaylistInfoItem)) return;
        final PlaylistInfoItem item = (PlaylistInfoItem) infoItem;

--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+	public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
@@ -8,6 +8,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.Localization;

 /*
@@ -40,8 +41,8 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
    }

    @Override
-    public void updateFromItem(final InfoItem infoItem) {
-        super.updateFromItem(infoItem);
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        super.updateFromItem(infoItem, historyRecordManager);

        if (!(infoItem instanceof StreamInfoItem)) return;
        final StreamInfoItem item = (StreamInfoItem) infoItem;
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -7,12 +7,18 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;
+
+import java.util.concurrent.TimeUnit;

 public class StreamMiniInfoItemHolder extends InfoItemHolder {

@@ -20,6 +26,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
    public final TextView itemVideoTitleView;
    public final TextView itemUploaderView;
    public final TextView itemDurationView;
+    public final AnimatedProgressBar itemProgressView;

    StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
        super(infoItemBuilder, layoutId, parent);
@@ -28,6 +35,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
        itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
        itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
        itemDurationView = itemView.findViewById(R.id.itemDurationView);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
    }

    public StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
@@ -35,7 +43,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
    }

    @Override
-    public void updateFromItem(final InfoItem infoItem) {
+    public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
        if (!(infoItem instanceof StreamInfoItem)) return;
        final StreamInfoItem item = (StreamInfoItem) infoItem;

@@ -47,13 +55,24 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                    R.color.duration_background_color));
            itemDurationView.setVisibility(View.VISIBLE);
+
+            StreamStateEntity state2 = historyRecordManager.loadStreamState(infoItem).blockingGet()[0];
+            if (state2 != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.getDuration());
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state2.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
        } else if (item.getStreamType() == StreamType.LIVE_STREAM) {
            itemDurationView.setText(R.string.duration_live);
            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                    R.color.live_duration_background_color));
            itemDurationView.setVisibility(View.VISIBLE);
+            itemProgressView.setVisibility(View.GONE);
        } else {
            itemDurationView.setVisibility(View.GONE);
+            itemProgressView.setVisibility(View.GONE);
        }

        // Default thumbnail is shown on error, while loading and if the url is empty
@@ -83,6 +102,24 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
        }
    }

+    @Override
+    public void updateState(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) {
+        final StreamInfoItem item = (StreamInfoItem) infoItem;
+
+        StreamStateEntity state = historyRecordManager.loadStreamState(infoItem).blockingGet()[0];
+        if (state != null && item.getDuration() > 0 && item.getStreamType() != StreamType.LIVE_STREAM) {
+            itemProgressView.setMax((int) item.getDuration());
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
+
    private void enableLongClick(final StreamInfoItem item) {
        itemView.setLongClickable(true);
        itemView.setOnLongClickListener(view -> {
@@ -97,4 +134,4 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
        itemView.setLongClickable(false);
        itemView.setOnLongClickListener(null);
    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BaseLocalListFragment.java
@@ -1,8 +1,13 @@
-package org.schabi.newpipe.fragments.local.bookmark;
+package org.schabi.newpipe.local;

+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -13,7 +18,6 @@ import android.view.View;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.list.ListViewContract;
-import org.schabi.newpipe.fragments.local.LocalItemListAdapter;

 import static org.schabi.newpipe.util.AnimationUtils.animateView;

@@ -26,7 +30,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 * called and is memory efficient when in backstack.
 * */
 public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
-        implements ListViewContract<I, N> {
+        implements ListViewContract<I, N>, SharedPreferences.OnSharedPreferenceChangeListener {

    /*//////////////////////////////////////////////////////////////////////////
    // Views
@@ -37,6 +41,9 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>

    protected LocalItemListAdapter itemListAdapter;
    protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

    /*//////////////////////////////////////////////////////////////////////////
    // Lifecycle - Creation
@@ -46,6 +53,29 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                itemListAdapter.setGridItemVariants(useGrid);
+                itemListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -60,6 +90,16 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
    }

+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    protected RecyclerView.LayoutManager getListLayoutManager() {
        return new LinearLayoutManager(activity);
    }
@@ -68,10 +108,13 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

-        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
-
        itemListAdapter = new LocalItemListAdapter(activity);
+
+        final boolean useGrid = isGridLayout();
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        itemListAdapter.setGridItemVariants(useGrid);
        itemListAdapter.setHeader(headerRootView = getListHeader());
        itemListAdapter.setFooter(footerRootView = getListFooter());

@@ -175,4 +218,22 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
        resetFragment();
        return super.onError(exception);
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/HeaderFooterHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/HeaderFooterHolder.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local;
+package org.schabi.newpipe.local;

 import android.support.v7.widget.RecyclerView;
 import android.view.View;
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemBuilder.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local;
+package org.schabi.newpipe.local;

 import android.content.Context;
 import android.widget.ImageView;
@@ -33,7 +33,7 @@ public class LocalItemBuilder {
    private static final String TAG = LocalItemBuilder.class.toString();

    private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();

    private OnClickGesture<LocalItem> onSelectedListener;

--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
@@ -1,17 +1,27 @@
-package org.schabi.newpipe.fragments.local;
+package org.schabi.newpipe.local;

-import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.fragments.local.holder.LocalItemHolder;
-import org.schabi.newpipe.fragments.local.holder.LocalPlaylistItemHolder;
-import org.schabi.newpipe.fragments.local.holder.LocalPlaylistStreamItemHolder;
-import org.schabi.newpipe.fragments.local.holder.LocalStatisticStreamItemHolder;
-import org.schabi.newpipe.fragments.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.OnClickGesture;

@@ -49,22 +59,29 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View

    private static final int STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
    private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
+    private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
+    private static final int STREAM_PLAYLIST_GRID_HOLDER_TYPE = 0x1004;
    private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
    private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x2001;
+	private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2002;
+	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;

    private final LocalItemBuilder localItemBuilder;
    private final ArrayList<LocalItem> localItems;
+    private final HistoryRecordManager recordManager;
    private final DateFormat dateFormat;

    private boolean showFooter = false;
+    private boolean useGridVariant = false;
    private View header = null;
    private View footer = null;

-    public LocalItemListAdapter(Activity activity) {
-        localItemBuilder = new LocalItemBuilder(activity);
+    public LocalItemListAdapter(Context context) {
+        recordManager = new HistoryRecordManager(context);
+        localItemBuilder = new LocalItemBuilder(context);
        localItems = new ArrayList<>();
        dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,
-                Localization.getPreferredLocale(activity));
+                Localization.getPreferredLocale(context));
    }

    public void setSelectedListener(OnClickGesture<LocalItem> listener) {
@@ -75,38 +92,33 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        localItemBuilder.setOnItemSelectedListener(null);
    }

-    public void addItems(List<? extends LocalItem> data) {
-        if (data != null) {
-            if (DEBUG) {
-                Log.d(TAG, "addItems() before > localItems.size() = " +
-                        localItems.size() + ", data.size() = " + data.size());
-            }
+    public void addItems(@Nullable List<? extends LocalItem> data) {
+        if (data == null) {
+            return;
+        }
+        if (DEBUG) Log.d(TAG, "addItems() before > localItems.size() = " +
+                localItems.size() + ", data.size() = " + data.size());

-            int offsetStart = sizeConsideringHeader();
-            localItems.addAll(data);
+        int offsetStart = sizeConsideringHeader();
+        localItems.addAll(data);

-            if (DEBUG) {
-                Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
-                        ", localItems.size() = " + localItems.size() +
-                        ", header = " + header + ", footer = " + footer +
-                        ", showFooter = " + showFooter);
-            }
+        if (DEBUG) Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
+                ", localItems.size() = " + localItems.size() +
+                ", header = " + header + ", footer = " + footer +
+                ", showFooter = " + showFooter);
+        notifyItemRangeInserted(offsetStart, data.size());

-            notifyItemRangeInserted(offsetStart, data.size());
+        if (footer != null && showFooter) {
+            int footerNow = sizeConsideringHeader();
+            notifyItemMoved(offsetStart, footerNow);

-            if (footer != null && showFooter) {
-                int footerNow = sizeConsideringHeader();
-                notifyItemMoved(offsetStart, footerNow);
-
-                if (DEBUG) Log.d(TAG, "addItems() footer from " + offsetStart +
-                        " to " + footerNow);
-            }
+            if (DEBUG) Log.d(TAG, "addItems() footer from " + offsetStart +
+                    " to " + footerNow);
        }
    }

    public void removeItem(final LocalItem data) {
        final int index = localItems.indexOf(data);
-
        localItems.remove(index);
        notifyItemRemoved(index + (header != null ? 1 : 0));
    }
@@ -131,6 +143,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        notifyDataSetChanged();
    }

+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
    public void setHeader(View header) {
        boolean changed = header != this.header;
        this.header = header;
@@ -192,11 +208,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        final LocalItem item = localItems.get(position);

        switch (item.getLocalItemType()) {
-            case PLAYLIST_LOCAL_ITEM: return LOCAL_PLAYLIST_HOLDER_TYPE;
-            case PLAYLIST_REMOTE_ITEM: return REMOTE_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_REMOTE_ITEM: return useGridVariant ? REMOTE_PLAYLIST_GRID_HOLDER_TYPE : REMOTE_PLAYLIST_HOLDER_TYPE;

-            case PLAYLIST_STREAM_ITEM: return STREAM_PLAYLIST_HOLDER_TYPE;
-            case STATISTIC_STREAM_ITEM: return STREAM_STATISTICS_HOLDER_TYPE;
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_HOLDER_TYPE;
+            case STATISTIC_STREAM_ITEM: return useGridVariant ? STREAM_STATISTICS_GRID_HOLDER_TYPE : STREAM_STATISTICS_HOLDER_TYPE;
            default:
                Log.e(TAG, "No holder type has been considered for item: [" +
                        item.getLocalItemType() + "]");
@@ -204,8 +220,9 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        }
    }

+    @NonNull
    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int type) {
        if (DEBUG) Log.d(TAG, "onCreateViewHolder() called with: parent = [" +
                parent + "], type = [" + type + "]");
        switch (type) {
@@ -215,20 +232,28 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                return new HeaderFooterHolder(footer);
            case LOCAL_PLAYLIST_HOLDER_TYPE:
                return new LocalPlaylistItemHolder(localItemBuilder, parent);
+            case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
            case REMOTE_PLAYLIST_HOLDER_TYPE:
                return new RemotePlaylistItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
+                return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
            case STREAM_PLAYLIST_HOLDER_TYPE:
                return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistStreamGridItemHolder(localItemBuilder, parent);
            case STREAM_STATISTICS_HOLDER_TYPE:
                return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_GRID_HOLDER_TYPE:
+                return new LocalStatisticStreamGridItemHolder(localItemBuilder, parent);
            default:
                Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
        if (DEBUG) Log.d(TAG, "onBindViewHolder() called with: holder = [" +
                holder.getClass().getSimpleName() + "], position = [" + position + "]");

@@ -236,7 +261,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
            // If header isn't null, offset the items by -1
            if (header != null) position--;

-            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), dateFormat);
+            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), recordManager, dateFormat);
        } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
            ((HeaderFooterHolder) holder).view = header;
        } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
@@ -244,4 +269,29 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
            ((HeaderFooterHolder) holder).view = footer;
        }
    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (!payloads.isEmpty() && holder instanceof LocalItemHolder) {
+            for (Object payload : payloads) {
+                if (payload instanceof StreamStateEntity) {
+                    ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), recordManager);
+                } else if (payload instanceof Boolean) {
+                    ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), recordManager);
+                }
+            }
+        } else {
+            onBindViewHolder(holder, position);
+        }
+    }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local.bookmark;
+package org.schabi.newpipe.local.bookmark;

 import android.app.AlertDialog;
 import android.os.Bundle;
@@ -19,8 +19,9 @@ import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.fragments.local.LocalPlaylistManager;
-import org.schabi.newpipe.fragments.local.RemotePlaylistManager;
+import org.schabi.newpipe.local.BaseLocalListFragment;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -38,9 +39,6 @@ import io.reactivex.disposables.CompositeDisposable;
 public final class BookmarkFragment
        extends BaseLocalListFragment<List<PlaylistLocalItem>, Void> {

-    private View lastPlayedButton;
-    private View mostPlayedButton;
-
    @State
    protected Parcelable itemsListState;

@@ -68,11 +66,10 @@ public final class BookmarkFragment
    public View onCreateView(@NonNull LayoutInflater inflater,
                             @Nullable ViewGroup container,
                             Bundle savedInstanceState) {
-        if (activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
-            activity.setTitle(R.string.tab_subscriptions);
-        }

+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.tab_bookmarks));
+        }
        return inflater.inflate(R.layout.fragment_bookmarks, container, false);
    }

@@ -94,15 +91,6 @@ public final class BookmarkFragment
        super.initViews(rootView, savedInstanceState);
    }

-    @Override
-    protected View getListHeader() {
-        final View headerRootLayout = activity.getLayoutInflater()
-                .inflate(R.layout.bookmark_header, itemsList, false);
-        lastPlayedButton = headerRootLayout.findViewById(R.id.lastPlayed);
-        mostPlayedButton = headerRootLayout.findViewById(R.id.mostPlayed);
-        return headerRootLayout;
-    }
-
    @Override
    protected void initListeners() {
        super.initListeners();
@@ -110,9 +98,7 @@ public final class BookmarkFragment
        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
            @Override
            public void selected(LocalItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                if (getParentFragment() == null) return;
-                final FragmentManager fragmentManager = getParentFragment().getFragmentManager();
+                final FragmentManager fragmentManager = getFM();

                if (selectedItem instanceof PlaylistMetadataEntry) {
                    final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
@@ -121,8 +107,11 @@ public final class BookmarkFragment

                } else if (selectedItem instanceof PlaylistRemoteEntity) {
                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
-                    NavigationHelper.openPlaylistFragment(fragmentManager, entry.getServiceId(),
-                            entry.getUrl(), entry.getName());
+                    NavigationHelper.openPlaylistFragment(
+                            fragmentManager,
+                            entry.getServiceId(),
+                            entry.getUrl(),
+                            entry.getName());
                }
            }

@@ -136,18 +125,6 @@ public final class BookmarkFragment
                }
            }
        });
-
-        lastPlayedButton.setOnClickListener(view -> {
-            if (getParentFragment() != null) {
-                NavigationHelper.openLastPlayedFragment(getParentFragment().getFragmentManager());
-            }
-        });
-
-        mostPlayedButton.setOnClickListener(view -> {
-            if (getParentFragment() != null) {
-                NavigationHelper.openMostPlayedFragment(getParentFragment().getFragmentManager());
-            }
-        });
    }

    ///////////////////////////////////////////////////////////////////////////
@@ -180,8 +157,6 @@ public final class BookmarkFragment
    @Override
    public void onDestroyView() {
        super.onDestroyView();
-        if (mostPlayedButton != null) mostPlayedButton.setOnClickListener(null);
-        if (lastPlayedButton != null) lastPlayedButton.setOnClickListener(null);

        if (disposables != null) disposables.clear();
        if (databaseSubscription != null) databaseSubscription.cancel();
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistAppendDialog.java
@@ -1,6 +1,5 @@
-package org.schabi.newpipe.fragments.local.dialog;
+package org.schabi.newpipe.local.dialog;

-import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -18,9 +17,9 @@ import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.fragments.local.LocalItemListAdapter;
-import org.schabi.newpipe.fragments.local.LocalPlaylistManager;
-import org.schabi.newpipe.playlist.PlayQueueItem;
+import org.schabi.newpipe.local.LocalItemListAdapter;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.OnClickGesture;

 import java.util.ArrayList;
@@ -28,7 +27,7 @@ import java.util.Collections;
 import java.util.List;

 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.disposables.CompositeDisposable;

 public final class PlaylistAppendDialog extends PlaylistDialog {
    private static final String TAG = PlaylistAppendDialog.class.getCanonicalName();
@@ -36,7 +35,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
    private RecyclerView playlistRecyclerView;
    private LocalItemListAdapter playlistAdapter;

-    private Disposable playlistReactor;
+    private CompositeDisposable playlistDisposables = new CompositeDisposable();

    public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
        PlaylistAppendDialog dialog = new PlaylistAppendDialog();
@@ -99,9 +98,9 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
        final View newPlaylistButton = view.findViewById(R.id.newPlaylist);
        newPlaylistButton.setOnClickListener(ignored -> openCreatePlaylistDialog());

-        playlistReactor = playlistManager.getPlaylists()
+        playlistDisposables.add(playlistManager.getPlaylists()
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::onPlaylistsReceived);
+                .subscribe(this::onPlaylistsReceived));
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -111,10 +110,12 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
    @Override
    public void onDestroyView() {
        super.onDestroyView();
-        if (playlistReactor != null) playlistReactor.dispose();
-        if (playlistAdapter != null) playlistAdapter.unsetSelectedListener();
+        playlistDisposables.dispose();
+        if (playlistAdapter != null) {
+            playlistAdapter.unsetSelectedListener();
+        }

-        playlistReactor = null;
+        playlistDisposables.clear();
        playlistRecyclerView = null;
        playlistAdapter = null;
    }
@@ -148,13 +149,12 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
                                    @NonNull List<StreamEntity> streams) {
        if (getStreams() == null) return;

-        @SuppressLint("ShowToast")
        final Toast successToast = Toast.makeText(getContext(),
                R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);

-        manager.appendToPlaylist(playlist.uid, streams)
+        playlistDisposables.add(manager.appendToPlaylist(playlist.uid, streams)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(ignored -> successToast.show());
+                .subscribe(ignored -> successToast.show()));

        getDialog().dismiss();
    }
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistCreationDialog.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local.dialog;
+package org.schabi.newpipe.local.dialog;

 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -12,7 +12,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
-import org.schabi.newpipe.fragments.local.LocalPlaylistManager;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;

 import java.util.List;

--- a/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/dialog/PlaylistDialog.java
@@ -1,9 +1,11 @@
-package org.schabi.newpipe.fragments.local.dialog;
+package org.schabi.newpipe.local.dialog;

+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.view.Window;

 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.util.StateSaver;
@@ -41,6 +43,18 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
        StateSaver.onDestroy(savedState);
    }

+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = super.onCreateDialog(savedInstanceState);
+        //remove title
+        final Window window = dialog.getWindow();
+        if (window != null) {
+            window.requestFeature(Window.FEATURE_NO_TITLE);
+        }
+        return dialog;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // State Saving
    //////////////////////////////////////////////////////////////////////////*/
@@ -58,7 +72,7 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave

    @Override
    @SuppressWarnings("unchecked")
-    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+    public void readFrom(@NonNull Queue<Object> savedObjects) {
        streamEntities = (List<StreamEntity>) savedObjects.poll();
    }

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.list.feed;
+package org.schabi.newpipe.local.feed;

 import android.os.Bundle;
 import android.os.Handler;
@@ -21,8 +21,8 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
+import org.schabi.newpipe.local.subscription.SubscriptionService;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.subscription.SubscriptionService;

 import java.util.Collections;
 import java.util.HashSet;
@@ -36,8 +36,6 @@ import io.reactivex.MaybeObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;

 public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Void> {

@@ -71,6 +69,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi

    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+
+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
        return inflater.inflate(R.layout.fragment_feed, container, false);
    }

@@ -105,20 +107,19 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        super.onDestroyView();
    }

-    /*@Override
-    protected RecyclerView.LayoutManager getListLayoutManager() {
-        boolean isPortrait = getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels;
-        return new GridLayoutManager(activity, isPortrait ? 1 : 2);
-    }*/
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
+    }

    @Override
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
        super.onCreateOptionsMenu(menu, inflater);

        ActionBar supportActionBar = activity.getSupportActionBar();
-        if (supportActionBar != null) {
-            supportActionBar.setTitle(R.string.fragment_whats_new);
-        }

        if(useAsFrontPage) {
            supportActionBar.setDisplayShowTitleEnabled(true);
@@ -176,19 +177,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        showLoading();
        showListFooter(true);
        subscriptionObserver = subscriptionService.getSubscription()
-                .onErrorReturnItem(Collections.<SubscriptionEntity>emptyList())
+                .onErrorReturnItem(Collections.emptyList())
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        handleResult(subscriptionEntities);
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        onError(throwable);
-                    }
-                });
+                .subscribe(this::handleResult, this::onError);
    }

    @Override
@@ -239,13 +230,12 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
                if (!itemsLoaded.contains(subscriptionEntity.getServiceId() + subscriptionEntity.getUrl())) {
                    subscriptionService.getChannelInfo(subscriptionEntity)
                            .observeOn(AndroidSchedulers.mainThread())
-                            .onErrorComplete(new Predicate<Throwable>() {
-                                @Override
-                                public boolean test(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
-                                    return FeedFragment.super.onError(throwable);
-                                }
-                            })
-                            .subscribe(getChannelInfoObserver(subscriptionEntity.getServiceId(), subscriptionEntity.getUrl()));
+                            .onErrorComplete(
+                                    (@io.reactivex.annotations.NonNull Throwable throwable) ->
+                                            FeedFragment.super.onError(throwable))
+                            .subscribe(
+                                    getChannelInfoObserver(subscriptionEntity.getServiceId(),
+                                            subscriptionEntity.getUrl()));
                } else {
                    requestFeed(1);
                }
@@ -272,7 +262,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
     * If chosen feed already displayed, then we request another feed from another
     * subscription, until the subscription table runs out of new items.
     * <p>
-     * This Observer is self-contained and will dispose itself when complete. However, this
+     * This Observer is self-contained and will close itself when complete. However, this
     * does not obey the fragment lifecycle and may continue running in the background
     * until it is complete. This is done due to RxJava2 no longer propagate errors once
     * an observer is unsubscribed while the thread process is still running.
@@ -316,7 +306,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi

            @Override
            public void onError(Throwable exception) {
-                showSnackBarError(exception, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(serviceId), url, 0);
+                showSnackBarError(exception,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(serviceId),
+                        url, 0);
                requestFeed(1);
                onDone();
            }
@@ -361,12 +354,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        delayHandler.removeCallbacksAndMessages(null);
        // Add a little of a delay when requesting more items because the cache is so fast,
        // that the view seems stuck to the user when he scroll to the bottom
-        delayHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                requestFeed(FEED_LOAD_COUNT);
-            }
-        }, 300);
+        delayHandler.postDelayed(() -> requestFeed(FEED_LOAD_COUNT), 300);
    }

    @Override
@@ -423,7 +411,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        int heightPixels = getResources().getDisplayMetrics().heightPixels;
        int itemHeightPixels = activity.getResources().getDimensionPixelSize(R.dimen.video_item_search_height);

-        int items = itemHeightPixels > 0 ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT : MIN_ITEMS_INITIAL_LOAD;
+        int items = itemHeightPixels > 0
+                ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT
+                : MIN_ITEMS_INITIAL_LOAD;
        return Math.max(MIN_ITEMS_INITIAL_LOAD, items);
    }

@@ -441,8 +431,14 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
    protected boolean onError(Throwable exception) {
        if (super.onError(exception)) return true;

-        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Requesting feed", errorId);
+        int errorId = exception instanceof ExtractionException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Requesting feed",
+                errorId);
        return true;
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
@@ -1,7 +1,6 @@
-package org.schabi.newpipe.history;
+package org.schabi.newpipe.local.history;

 import android.content.Context;
-import android.content.res.Resources;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.history;
+package org.schabi.newpipe.local.history;

 import android.support.annotation.Nullable;

--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -1,4 +1,22 @@
-package org.schabi.newpipe.history;
+package org.schabi.newpipe.local.history;
+
+/*
+ * Copyright (C) Mauricio Colli 2018
+ * HistoryRecordManager.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */

 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,25 +26,32 @@ import android.support.annotation.NonNull;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.AppDatabase;
+import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
 import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
+import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.stream.dao.StreamDAO;
 import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;

 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;

+import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
+import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;

@@ -62,9 +87,9 @@ public class HistoryRecordManager {
        final Date currentTime = new Date();
        return Maybe.fromCallable(() -> database.runInTransaction(() -> {
            final long streamId = streamTable.upsert(new StreamEntity(info));
-            StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry();
+            StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId);

-            if (latestEntry != null && latestEntry.getStreamUid() == streamId) {
+            if (latestEntry != null) {
                streamHistoryTable.delete(latestEntry);
                latestEntry.setAccessDate(currentTime);
                latestEntry.setRepeatCount(latestEntry.getRepeatCount() + 1);
@@ -80,6 +105,16 @@ public class HistoryRecordManager {
                .subscribeOn(Schedulers.io());
    }

+    public Single<Integer> deleteWholeStreamHistory() {
+        return Single.fromCallable(streamHistoryTable::deleteAll)
+                .subscribeOn(Schedulers.io());
+    }
+
+    public Single<Integer> deleteCompelteStreamStateHistory() {
+        return Single.fromCallable(streamStateTable::deleteAll)
+                .subscribeOn(Schedulers.io());
+    }
+
    public Flowable<List<StreamHistoryEntry>> getStreamHistory() {
        return streamHistoryTable.getHistory().subscribeOn(Schedulers.io());
    }
@@ -114,20 +149,6 @@ public class HistoryRecordManager {
    // Search History
    ///////////////////////////////////////////////////////

-    public Single<List<Long>> insertSearches(final Collection<SearchHistoryEntry> entries) {
-        return Single.fromCallable(() -> searchHistoryTable.insertAll(entries))
-                .subscribeOn(Schedulers.io());
-    }
-
-    public Single<Integer> deleteSearches(final Collection<SearchHistoryEntry> entries) {
-        return Single.fromCallable(() -> searchHistoryTable.delete(entries))
-                .subscribeOn(Schedulers.io());
-    }
-
-    public Flowable<List<SearchHistoryEntry>> getSearchHistory() {
-        return searchHistoryTable.getAll();
-    }
-
    public Maybe<Long> onSearched(final int serviceId, final String search) {
        if (!isSearchHistoryEnabled()) return Maybe.empty();

@@ -150,6 +171,11 @@ public class HistoryRecordManager {
                .subscribeOn(Schedulers.io());
    }

+    public Single<Integer> deleteCompleteSearchHistory() {
+        return Single.fromCallable(searchHistoryTable::deleteAll)
+                .subscribeOn(Schedulers.io());
+    }
+
    public Flowable<List<SearchHistoryEntry>> getRelatedSearches(final String query,
                                                                 final int similarQueryLimit,
                                                                 final int uniqueQueryLimit) {
@@ -166,21 +192,104 @@ public class HistoryRecordManager {
    // Stream State History
    ///////////////////////////////////////////////////////

-    @SuppressWarnings("unused")
-    public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
-        return Maybe.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
-                .flatMap(streamId -> streamStateTable.getState(streamId).firstElement())
-                .flatMap(states -> states.isEmpty() ? Maybe.empty() : Maybe.just(states.get(0)))
+    public Maybe<StreamHistoryEntity> getStreamHistory(final StreamInfo info) {
+        return Maybe.fromCallable(() -> {
+            final long streamId = streamTable.upsert(new StreamEntity(info));
+            return streamHistoryTable.getLatestEntry(streamId);
+        }).subscribeOn(Schedulers.io());
+    }
+
+    public Maybe<StreamStateEntity> loadStreamState(final PlayQueueItem queueItem) {
+        return queueItem.getStream()
+                .map((info) -> streamTable.upsert(new StreamEntity(info)))
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
+                .filter(state -> state.isValid((int) queueItem.getDuration()))
                .subscribeOn(Schedulers.io());
    }

-    public Maybe<Long> saveStreamState(@NonNull final StreamInfo info, final long progressTime) {
-        return Maybe.fromCallable(() -> database.runInTransaction(() -> {
+    public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
+        return Single.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
+                .filter(state -> state.isValid((int) info.getDuration()))
+                .subscribeOn(Schedulers.io());
+    }
+
+    public Completable saveStreamState(@NonNull final StreamInfo info, final long progressTime) {
+        return Completable.fromAction(() -> database.runInTransaction(() -> {
            final long streamId = streamTable.upsert(new StreamEntity(info));
-            return streamStateTable.upsert(new StreamStateEntity(streamId, progressTime));
+            final StreamStateEntity state = new StreamStateEntity(streamId, progressTime);
+            if (state.isValid((int) info.getDuration())) {
+                streamStateTable.upsert(state);
+            } else {
+                streamStateTable.deleteState(streamId);
+            }
        })).subscribeOn(Schedulers.io());
    }

+    public Single<StreamStateEntity[]> loadStreamState(final InfoItem info) {
+        return Single.fromCallable(() -> {
+            final List<StreamEntity> entities = streamTable.getStream(info.getServiceId(), info.getUrl()).blockingFirst();
+            if (entities.isEmpty()) {
+                return new StreamStateEntity[]{null};
+            }
+            final List<StreamStateEntity> states = streamStateTable.getState(entities.get(0).getUid()).blockingFirst();
+            if (states.isEmpty()) {
+                return new StreamStateEntity[]{null};
+            }
+            return new StreamStateEntity[]{states.get(0)};
+        }).subscribeOn(Schedulers.io());
+    }
+
+    public Single<List<StreamStateEntity>> loadStreamStateBatch(final List<InfoItem> infos) {
+        return Single.fromCallable(() -> {
+            final List<StreamStateEntity> result = new ArrayList<>(infos.size());
+            for (InfoItem info : infos) {
+                final List<StreamEntity> entities = streamTable.getStream(info.getServiceId(), info.getUrl()).blockingFirst();
+                if (entities.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                final List<StreamStateEntity> states = streamStateTable.getState(entities.get(0).getUid()).blockingFirst();
+                if (states.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                result.add(states.get(0));
+            }
+            return result;
+        }).subscribeOn(Schedulers.io());
+    }
+
+    public Single<List<StreamStateEntity>> loadLocalStreamStateBatch(final List<? extends LocalItem> items) {
+        return Single.fromCallable(() -> {
+            final List<StreamStateEntity> result = new ArrayList<>(items.size());
+            for (LocalItem item : items) {
+                long streamId;
+                if (item instanceof StreamStatisticsEntry) {
+                    streamId = ((StreamStatisticsEntry) item).streamId;
+                } else if (item instanceof PlaylistStreamEntity) {
+                    streamId = ((PlaylistStreamEntity) item).getStreamUid();
+                } else if (item instanceof PlaylistStreamEntry) {
+                    streamId = ((PlaylistStreamEntry) item).streamId;
+                } else {
+                    result.add(null);
+                    continue;
+                }
+                final List<StreamStateEntity> states = streamStateTable.getState(streamId).blockingFirst();
+                if (states.isEmpty()) {
+                    result.add(null);
+                    continue;
+                }
+                result.add(states.get(0));
+            }
+            return result;
+        }).subscribeOn(Schedulers.io());
+    }
+
    ///////////////////////////////////////////////////////
    // Utility
    ///////////////////////////////////////////////////////
@@ -188,4 +297,5 @@ public class HistoryRecordManager {
    public Single<Integer> removeOrphanedRecords() {
        return Single.fromCallable(streamTable::deleteOrphans).subscribeOn(Schedulers.io());
    }
+
 }
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -0,0 +1,446 @@
+package org.schabi.newpipe.local.history;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.BaseLocalListFragment;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.OnClickGesture;
+import org.schabi.newpipe.util.StreamDialogEntry;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import icepick.State;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+
+public class StatisticsPlaylistFragment
+        extends BaseLocalListFragment<List<StreamStatisticsEntry>, Void> {
+
+    private View headerPlayAllButton;
+    private View headerPopupButton;
+    private View headerBackgroundButton;
+    private View playlistCtrl;
+    private View sortButton;
+    private ImageView sortButtonIcon;
+    private TextView sortButtonText;
+
+    @State
+    protected Parcelable itemsListState;
+
+    /* Used for independent events */
+    private Subscription databaseSubscription;
+    private HistoryRecordManager recordManager;
+    private final CompositeDisposable disposables = new CompositeDisposable();
+
+    private enum StatisticSortMode {
+        LAST_PLAYED,
+        MOST_PLAYED,
+    }
+
+    StatisticSortMode sortMode = StatisticSortMode.LAST_PLAYED;
+
+    protected List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results) {
+        switch (sortMode) {
+            case LAST_PLAYED:
+                Collections.sort(results, (left, right) ->
+                    right.latestAccessDate.compareTo(left.latestAccessDate));
+                return results;
+            case MOST_PLAYED:
+                Collections.sort(results, (left, right) ->
+                        Long.compare(right.watchCount, left.watchCount));
+                return results;
+            default: return null;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Creation
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        recordManager = new HistoryRecordManager(getContext());
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_playlist, container, false);
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.title_activity_history));
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_history, menu);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Views
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+        if(!useAsFrontPage) {
+            setTitle(getString(R.string.title_last_played));
+        }
+    }
+
+    @Override
+    protected View getListHeader() {
+        final View headerRootLayout = activity.getLayoutInflater().inflate(R.layout.statistic_playlist_control,
+                itemsList, false);
+        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
+        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
+        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
+        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
+        sortButton = headerRootLayout.findViewById(R.id.sortButton);
+        sortButtonIcon = headerRootLayout.findViewById(R.id.sortButtonIcon);
+        sortButtonText = headerRootLayout.findViewById(R.id.sortButtonText);
+        return headerRootLayout;
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+
+        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
+            @Override
+            public void selected(LocalItem selectedItem) {
+                if (selectedItem instanceof StreamStatisticsEntry) {
+                    final StreamStatisticsEntry item = (StreamStatisticsEntry) selectedItem;
+                    NavigationHelper.openVideoDetailFragment(getFM(),
+                            item.serviceId,
+                            item.url,
+                            item.title);
+                }
+            }
+
+            @Override
+            public void held(LocalItem selectedItem) {
+                if (selectedItem instanceof StreamStatisticsEntry) {
+                    showStreamDialog((StreamStatisticsEntry) selectedItem);
+                }
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_history_clear:
+                new AlertDialog.Builder(activity)
+                        .setTitle(R.string.delete_view_history_alert)
+                        .setNegativeButton(R.string.cancel, ((dialog, which) -> dialog.dismiss()))
+                        .setPositiveButton(R.string.delete, ((dialog, which) -> {
+                            final Disposable onDelete = recordManager.deleteWholeStreamHistory()
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribe(
+                                            howManyDeleted -> Toast.makeText(getContext(),
+                                                    R.string.watch_history_deleted,
+                                                    Toast.LENGTH_SHORT).show(),
+                                            throwable -> ErrorActivity.reportError(getContext(),
+                                                    throwable,
+                                                    SettingsActivity.class, null,
+                                                    ErrorActivity.ErrorInfo.make(
+                                                            UserAction.DELETE_FROM_HISTORY,
+                                                            "none",
+                                                            "Delete view history",
+                                                            R.string.general_error)));
+
+                            final Disposable onClearOrphans = recordManager.removeOrphanedRecords()
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribe(
+                                            howManyDeleted -> {},
+                                            throwable -> ErrorActivity.reportError(getContext(),
+                                                    throwable,
+                                                    SettingsActivity.class, null,
+                                                    ErrorActivity.ErrorInfo.make(
+                                                            UserAction.DELETE_FROM_HISTORY,
+                                                            "none",
+                                                            "Delete search history",
+                                                            R.string.general_error)));
+                            disposables.add(onClearOrphans);
+                            disposables.add(onDelete);
+                        }))
+                        .create()
+                        .show();
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Loading
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+        recordManager.getStreamStatistics()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getHistoryObserver());
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Destruction
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        if (itemListAdapter != null) itemListAdapter.unsetSelectedListener();
+        if (headerBackgroundButton != null) headerBackgroundButton.setOnClickListener(null);
+        if (headerPlayAllButton != null) headerPlayAllButton.setOnClickListener(null);
+        if (headerPopupButton != null) headerPopupButton.setOnClickListener(null);
+
+        if (databaseSubscription != null) databaseSubscription.cancel();
+        databaseSubscription = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        recordManager = null;
+        itemsListState = null;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Statistics Loader
+    ///////////////////////////////////////////////////////////////////////////
+
+    private Subscriber<List<StreamStatisticsEntry>> getHistoryObserver() {
+        return new Subscriber<List<StreamStatisticsEntry>>() {
+            @Override
+            public void onSubscribe(Subscription s) {
+                showLoading();
+
+                if (databaseSubscription != null) databaseSubscription.cancel();
+                databaseSubscription = s;
+                databaseSubscription.request(1);
+            }
+
+            @Override
+            public void onNext(List<StreamStatisticsEntry> streams) {
+                handleResult(streams);
+                if (databaseSubscription != null) databaseSubscription.request(1);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                StatisticsPlaylistFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        };
+    }
+
+    @Override
+    public void handleResult(@NonNull List<StreamStatisticsEntry> result) {
+        super.handleResult(result);
+        if (itemListAdapter == null) return;
+
+        playlistCtrl.setVisibility(View.VISIBLE);
+
+        itemListAdapter.clearStreamItemList();
+
+        if (result.isEmpty()) {
+            showEmptyState();
+            return;
+        }
+
+        itemListAdapter.addItems(processResult(result));
+        if (itemsListState != null) {
+            itemsList.getLayoutManager().onRestoreInstanceState(itemsListState);
+            itemsListState = null;
+        }
+
+        headerPlayAllButton.setOnClickListener(view ->
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
+        headerPopupButton.setOnClickListener(view ->
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
+        headerBackgroundButton.setOnClickListener(view ->
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
+        sortButton.setOnClickListener(view -> toggleSortMode());
+
+        hideLoading();
+    }
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment Error Handling
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void resetFragment() {
+        super.resetFragment();
+        if (databaseSubscription != null) databaseSubscription.cancel();
+    }
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        if (super.onError(exception)) return true;
+
+        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE,
+                "none", "History Statistics", R.string.general_error);
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void toggleSortMode() {
+        if(sortMode == StatisticSortMode.LAST_PLAYED) {
+            sortMode = StatisticSortMode.MOST_PLAYED;
+            setTitle(getString(R.string.title_most_played));
+            sortButtonIcon.setImageResource(ThemeHelper.getIconByAttr(R.attr.history, getContext()));
+            sortButtonText.setText(R.string.title_last_played);
+        } else {
+            sortMode = StatisticSortMode.LAST_PLAYED;
+            setTitle(getString(R.string.title_last_played));
+            sortButtonIcon.setImageResource(ThemeHelper.getIconByAttr(R.attr.filter, getContext()));
+            sortButtonText.setText(R.string.title_most_played);
+        }
+        startLoading(true);
+    }
+
+    private PlayQueue getPlayQueueStartingAt(StreamStatisticsEntry infoItem) {
+        return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0));
+    }
+
+    private void showStreamDialog(final StreamStatisticsEntry item) {
+        final Context context = getContext();
+        final Activity activity = getActivity();
+        if (context == null || context.getResources() == null || activity == null) return;
+        final StreamInfoItem infoItem = item.toStreamInfoItem();
+
+        if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.delete,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+        } else {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.enqueue_on_popup,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.start_here_on_popup,
+                    StreamDialogEntry.delete,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+
+            StreamDialogEntry.start_here_on_popup.setCustomAction(
+                    (fragment, infoItemDuplicate) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(item), true));
+        }
+
+        StreamDialogEntry.start_here_on_background.setCustomAction(
+                (fragment, infoItemDuplicate) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(item), true));
+        StreamDialogEntry.delete.setCustomAction((fragment, infoItemDuplicate) ->
+            deleteEntry(Math.max(itemListAdapter.getItemsList().indexOf(item), 0)));
+
+        new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context), (dialog, which) ->
+                StreamDialogEntry.clickOn(which, this, infoItem)).show();
+    }
+
+    private void deleteEntry(final int index) {
+        final LocalItem infoItem = itemListAdapter.getItemsList()
+                .get(index);
+        if(infoItem instanceof StreamStatisticsEntry) {
+            final StreamStatisticsEntry entry = (StreamStatisticsEntry) infoItem;
+            final Disposable onDelete = recordManager.deleteStreamHistory(entry.streamId)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                            howManyDeleted -> {
+                                if(getView() != null) {
+                                    Snackbar.make(getView(), R.string.one_item_deleted,
+                                            Snackbar.LENGTH_SHORT).show();
+                                } else {
+                                    Toast.makeText(getContext(),
+                                            R.string.one_item_deleted,
+                                            Toast.LENGTH_SHORT).show();
+                                }
+                            },
+                            throwable -> showSnackBarError(throwable,
+                                    UserAction.DELETE_FROM_HISTORY, "none",
+                                    "Deleting item failed", R.string.general_error));
+
+            disposables.add(onDelete);
+        }
+    }
+
+    private PlayQueue getPlayQueue() {
+        return getPlayQueue(0);
+    }
+
+    private PlayQueue getPlayQueue(final int index) {
+        if (itemListAdapter == null) {
+            return new SinglePlayQueue(Collections.emptyList(), 0);
+        }
+
+        final List<LocalItem> infoItems = itemListAdapter.getItemsList();
+        List<StreamInfoItem> streamInfoItems = new ArrayList<>(infoItems.size());
+        for (final LocalItem item : infoItems) {
+            if (item instanceof StreamStatisticsEntry) {
+                streamInfoItems.add(((StreamStatisticsEntry) item).toStreamInfoItem());
+            }
+        }
+        return new SinglePlayQueue(streamInfoItems, index);
+    }
+}
+
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalItemHolder.java
@@ -1,11 +1,12 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;

 import java.text.DateFormat;

@@ -38,5 +39,8 @@ public abstract class LocalItemHolder extends RecyclerView.ViewHolder {
        this.itemBuilder = itemBuilder;
    }

-    public abstract void updateFromItem(final LocalItem item, final DateFormat dateFormat);
+    public abstract void updateFromItem(final LocalItem item, HistoryRecordManager historyRecordManager, final DateFormat dateFormat);
+
+    public void updateState(final LocalItem localItem, HistoryRecordManager historyRecordManager) {
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistGridItemHolder extends LocalPlaylistItemHolder {
+
+	public LocalPlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistItemHolder.java
@@ -1,11 +1,12 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

 import android.view.View;
 import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.ImageDisplayConstants;

 import java.text.DateFormat;
@@ -16,8 +17,12 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
        super(infoItemBuilder, parent);
    }

+    LocalPlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
    @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) {
        if (!(localItem instanceof PlaylistMetadataEntry)) return;
        final PlaylistMetadataEntry item = (PlaylistMetadataEntry) localItem;

@@ -28,6 +33,6 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
        itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,
                ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS);

-        super.updateFromItem(localItem, dateFormat);
+        super.updateFromItem(localItem, historyRecordManager, dateFormat);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistStreamGridItemHolder extends LocalPlaylistStreamItemHolder {
+
+	public LocalPlaylistStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_playlist_grid_item, parent); //TODO
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

 import android.support.v4.content.ContextCompat;
 import android.view.MotionEvent;
@@ -10,12 +10,18 @@ import android.widget.TextView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;

 import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;

 public class LocalPlaylistStreamItemHolder extends LocalItemHolder {

@@ -24,6 +30,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
    public final TextView itemAdditionalDetailsView;
    public final TextView itemDurationView;
    public final View itemHandleView;
+    public final AnimatedProgressBar itemProgressView;

    LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
        super(infoItemBuilder, layoutId, parent);
@@ -33,6 +40,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
        itemAdditionalDetailsView = itemView.findViewById(R.id.itemAdditionalDetails);
        itemDurationView = itemView.findViewById(R.id.itemDurationView);
        itemHandleView = itemView.findViewById(R.id.itemHandle);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
    }

    public LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
@@ -40,7 +48,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
    }

    @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) {
        if (!(localItem instanceof PlaylistStreamEntry)) return;
        final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem;

@@ -53,6 +61,15 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                    R.color.duration_background_color));
            itemDurationView.setVisibility(View.VISIBLE);
+
+            StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList<LocalItem>() {{ add(localItem); }}).blockingGet().get(0);
+            if (state != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.duration);
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
        } else {
            itemDurationView.setVisibility(View.GONE);
        }
@@ -79,6 +96,25 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
        itemHandleView.setOnTouchListener(getOnTouchListener(item));
    }

+    @Override
+    public void updateState(LocalItem localItem, HistoryRecordManager historyRecordManager) {
+        if (!(localItem instanceof PlaylistStreamEntry)) return;
+        final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem;
+
+        StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList<LocalItem>() {{ add(localItem); }}).blockingGet().get(0);
+        if (state != null && item.duration > 0) {
+            itemProgressView.setMax((int) item.duration);
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
+
    private View.OnTouchListener getOnTouchListener(final PlaylistStreamEntry item) {
        return (view, motionEvent) -> {
            view.performClick();
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalStatisticStreamGridItemHolder extends LocalStatisticStreamItemHolder {
+
+	public LocalStatisticStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalStatisticStreamItemHolder.java
@@ -1,5 +1,6 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,12 +10,18 @@ import android.widget.TextView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.views.AnimatedProgressBar;

 import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;

 /*
 * Created by Christian Schabesberger on 01.08.16.
@@ -42,16 +49,23 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
    public final TextView itemVideoTitleView;
    public final TextView itemUploaderView;
    public final TextView itemDurationView;
+    @Nullable
    public final TextView itemAdditionalDetails;
+    public final AnimatedProgressBar itemProgressView;

-    public LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
-        super(infoItemBuilder, R.layout.list_stream_item, parent);
+    public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
+        this(itemBuilder, R.layout.list_stream_item, parent);
+    }
+
+    LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);

        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
        itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
        itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
        itemDurationView = itemView.findViewById(R.id.itemDurationView);
        itemAdditionalDetails = itemView.findViewById(R.id.itemAdditionalDetails);
+        itemProgressView = itemView.findViewById(R.id.itemProgressView);
    }

    private String getStreamInfoDetailLine(final StreamStatisticsEntry entry,
@@ -64,7 +78,7 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
    }

    @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) {
        if (!(localItem instanceof StreamStatisticsEntry)) return;
        final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem;

@@ -76,11 +90,23 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                    R.color.duration_background_color));
            itemDurationView.setVisibility(View.VISIBLE);
+
+            StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList<LocalItem>() {{ add(localItem); }}).blockingGet().get(0);
+            if (state != null) {
+                itemProgressView.setVisibility(View.VISIBLE);
+                itemProgressView.setMax((int) item.duration);
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setVisibility(View.GONE);
+            }
        } else {
            itemDurationView.setVisibility(View.GONE);
+            itemProgressView.setVisibility(View.GONE);
        }

-        itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        if (itemAdditionalDetails != null) {
+            itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        }

        // Default thumbnail is shown on error, while loading and if the url is empty
        itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,
@@ -100,4 +126,23 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
            return true;
        });
    }
+
+    @Override
+    public void updateState(LocalItem localItem, HistoryRecordManager historyRecordManager) {
+        if (!(localItem instanceof StreamStatisticsEntry)) return;
+        final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem;
+
+        StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList<LocalItem>() {{ add(localItem); }}).blockingGet().get(0);
+        if (state != null && item.duration > 0) {
+            itemProgressView.setMax((int) item.duration);
+            if (itemProgressView.getVisibility() == View.VISIBLE) {
+                itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+            } else {
+                itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime()));
+                AnimationUtils.animateView(itemProgressView, true, 500);
+            }
+        } else if (itemProgressView.getVisibility() == View.VISIBLE) {
+            AnimationUtils.animateView(itemProgressView, false, 500);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/PlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/PlaylistItemHolder.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -6,7 +6,8 @@ import android.widget.TextView;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;

 import java.text.DateFormat;

@@ -31,7 +32,7 @@ public abstract class PlaylistItemHolder extends LocalItemHolder {
    }

    @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) {
        itemView.setOnClickListener(view -> {
            if (itemBuilder.getOnItemSelectedListener() != null) {
                itemBuilder.getOnItemSelectedListener().selected(localItem);
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class RemotePlaylistGridItemHolder extends RemotePlaylistItemHolder {
+
+	public RemotePlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/RemotePlaylistItemHolder.java
@@ -1,11 +1,12 @@
-package org.schabi.newpipe.fragments.local.holder;
+package org.schabi.newpipe.local.holder;

 import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.fragments.local.LocalItemBuilder;
+import org.schabi.newpipe.local.LocalItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;

@@ -16,8 +17,12 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
        super(infoItemBuilder, parent);
    }

+    RemotePlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
    @Override
-    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
+    public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) {
        if (!(localItem instanceof PlaylistRemoteEntity)) return;
        final PlaylistRemoteEntity item = (PlaylistRemoteEntity) localItem;

@@ -29,6 +34,6 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
        itemBuilder.displayImage(item.getThumbnailUrl(), itemThumbnailView,
                ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS);

-        super.updateFromItem(localItem, dateFormat);
+        super.updateFromItem(localItem, historyRecordManager, dateFormat);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/LocalPlaylistFragment.java
@@ -1,8 +1,7 @@
-package org.schabi.newpipe.fragments.local.bookmark;
+package org.schabi.newpipe.local.playlist;

 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -26,14 +25,16 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.fragments.local.LocalPlaylistManager;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.local.BaseLocalListFragment;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
+import org.schabi.newpipe.util.StreamDialogEntry;

 import java.util.ArrayList;
 import java.util.Collections;
@@ -173,7 +174,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
            @Override
            public void held(LocalItem selectedItem) {
                if (selectedItem instanceof PlaylistStreamEntry) {
-                    showStreamDialog((PlaylistStreamEntry) selectedItem);
+                    showStreamItemDialog((PlaylistStreamEntry) selectedItem);
                }
            }

@@ -318,11 +319,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
        setVideoCount(itemListAdapter.getItemsList().size());

        headerPlayAllButton.setOnClickListener(view ->
-                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue(), false));
        headerPopupButton.setOnClickListener(view ->
-                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
        headerBackgroundButton.setOnClickListener(view ->
-                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));

        hideLoading();
    }
@@ -459,7 +460,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt


    private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
+        int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+        if (isGridLayout()) {
+            directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+        }
+        return new ItemTouchHelper.SimpleCallback(directions,
                ItemTouchHelper.ACTION_STATE_IDLE) {
            @Override
            public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
@@ -506,55 +511,48 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

-    protected void showStreamDialog(final PlaylistStreamEntry item) {
+    private PlayQueue getPlayQueueStartingAt(PlaylistStreamEntry infoItem) {
+        return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0));
+    }
+
+    protected void showStreamItemDialog(final PlaylistStreamEntry item) {
        final Context context = getContext();
        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || getActivity() == null) return;
-
+        if (context == null || context.getResources() == null || activity == null) return;
        final StreamInfoItem infoItem = item.toStreamInfoItem();

-        final String[] commands = new String[]{
-                context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.start_here_on_main),
-                context.getResources().getString(R.string.start_here_on_background),
-                context.getResources().getString(R.string.start_here_on_popup),
-                context.getResources().getString(R.string.set_as_playlist_thumbnail),
-                context.getResources().getString(R.string.delete)
-        };
+        if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.set_as_playlist_thumbnail,
+                    StreamDialogEntry.delete,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);
+        } else {
+            StreamDialogEntry.setEnabledEntries(
+                    StreamDialogEntry.enqueue_on_background,
+                    StreamDialogEntry.enqueue_on_popup,
+                    StreamDialogEntry.start_here_on_background,
+                    StreamDialogEntry.start_here_on_popup,
+                    StreamDialogEntry.set_as_playlist_thumbnail,
+                    StreamDialogEntry.delete,
+                    StreamDialogEntry.append_playlist,
+                    StreamDialogEntry.share);

-        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
-            final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0);
-            switch (i) {
-                case 0:
-                    NavigationHelper.enqueueOnBackgroundPlayer(context,
-                            new SinglePlayQueue(infoItem));
-                    break;
-                case 1:
-                    NavigationHelper.enqueueOnPopupPlayer(activity, new
-                            SinglePlayQueue(infoItem));
-                    break;
-                case 2:
-                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                    break;
-                case 3:
-                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                    break;
-                case 4:
-                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                    break;
-                case 5:
-                    changeThumbnailUrl(item.thumbnailUrl);
-                    break;
-                case 6:
-                    deleteItem(item);
-                    break;
-                default:
-                    break;
-            }
-        };
+            StreamDialogEntry.start_here_on_popup.setCustomAction(
+                    (fragment, infoItemDuplicate) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(item), true));
+        }

-        new InfoItemDialog(getActivity(), infoItem, commands, actions).show();
+        StreamDialogEntry.start_here_on_background.setCustomAction(
+                (fragment, infoItemDuplicate) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(item), true));
+        StreamDialogEntry.set_as_playlist_thumbnail.setCustomAction(
+                (fragment, infoItemDuplicate) -> changeThumbnailUrl(item.thumbnailUrl));
+        StreamDialogEntry.delete.setCustomAction(
+                (fragment, infoItemDuplicate) -> deleteItem(item));
+
+        new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context), (dialog, which) ->
+                StreamDialogEntry.clickOn(which, this, infoItem)).show();
    }

    private void setInitialData(long playlistId, String name) {
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistManager.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistManager.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local;
+package org.schabi.newpipe.local.playlist;

 import android.support.annotation.Nullable;

--- a/app/src/main/java/org/schabi/newpipe/fragments/local/RemotePlaylistManager.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/RemotePlaylistManager.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local;
+package org.schabi.newpipe.local.playlist;

 import org.schabi.newpipe.database.AppDatabase;
 import org.schabi.newpipe.database.playlist.dao.PlaylistRemoteDAO;
@@ -13,11 +13,9 @@ import io.reactivex.schedulers.Schedulers;

 public class RemotePlaylistManager {

-    private final AppDatabase database;
    private final PlaylistRemoteDAO playlistRemoteTable;

    public RemotePlaylistManager(final AppDatabase db) {
-        database = db;
        playlistRemoteTable = db.playlistRemoteDAO();
    }

@@ -42,8 +40,11 @@ public class RemotePlaylistManager {
        }).subscribeOn(Schedulers.io());
    }

-    public Single<Integer> onUpdate(final PlaylistInfo playlistInfo) {
-        return Single.fromCallable(() -> playlistRemoteTable.update(new PlaylistRemoteEntity(playlistInfo)))
-                .subscribeOn(Schedulers.io());
+    public Single<Integer> onUpdate(final long playlistId, final PlaylistInfo playlistInfo) {
+        return Single.fromCallable(() -> {
+            PlaylistRemoteEntity playlist = new PlaylistRemoteEntity(playlistInfo);
+            playlist.setUid(playlistId);
+            return playlistRemoteTable.update(playlist);
+        }).subscribeOn(Schedulers.io());
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/ImportConfirmationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/ImportConfirmationDialog.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.subscription;
+package org.schabi.newpipe.local.subscription;

 import android.app.AlertDialog;
 import android.app.Dialog;
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportEventListener.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportEventListener.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.subscription;
+package org.schabi.newpipe.local.subscription;

 public interface ImportExportEventListener {
    /**
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java
@@ -17,7 +17,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package org.schabi.newpipe.subscription;
+package org.schabi.newpipe.local.subscription;

 import android.support.annotation.Nullable;

--- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
@@ -1,20 +1,29 @@
-package org.schabi.newpipe.fragments.subscription;
+package org.schabi.newpipe.local.subscription;

+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -38,14 +47,14 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
+import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.subscription.SubscriptionService;
-import org.schabi.newpipe.subscription.services.SubscriptionsExportService;
-import org.schabi.newpipe.subscription.services.SubscriptionsImportService;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.CollapsibleView;

@@ -53,7 +62,6 @@ import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -65,13 +73,13 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;

-import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_MODE;
-import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.KEY_VALUE;
-import static org.schabi.newpipe.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE;
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;

-public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> {
+public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> implements SharedPreferences.OnSharedPreferenceChangeListener {
    private static final int REQUEST_EXPORT_CODE = 666;
    private static final int REQUEST_IMPORT_CODE = 667;

@@ -79,8 +87,10 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    @State
    protected Parcelable itemsListState;
    private InfoListAdapter infoListAdapter;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

-    private View headerRootLayout;
    private View whatsNewItemListHeader;
    private View importExportListHeader;

@@ -99,6 +109,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
    }

    @Override
@@ -116,6 +128,11 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        subscriptionService = SubscriptionService.getInstance(activity);
    }

+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
@@ -126,6 +143,15 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    public void onResume() {
        super.onResume();
        setupBroadcastReceiver();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    @Override
@@ -152,9 +178,25 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        disposables = null;
        subscriptionService = null;

+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
        super.onDestroy();
    }

+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    /*/////////////////////////////////////////////////////////////////////////
    // Menu
    /////////////////////////////////////////////////////////////////////////*/
@@ -209,7 +251,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    }

    private void setupImportFromItems(final ViewGroup listHolder) {
-        final View previousBackupItem = addItemView(getString(R.string.previous_export), ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
+        final View previousBackupItem = addItemView(getString(R.string.previous_export),
+                ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
        previousBackupItem.setOnClickListener(item -> onImportPreviousSelected());

        final int iconColor = ThemeHelper.isLightThemeSelected(getContext()) ? Color.BLACK : Color.WHITE;
@@ -241,8 +284,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    }

    private void onImportFromServiceSelected(int serviceId) {
-        if (getParentFragment() == null) return;
-        NavigationHelper.openSubscriptionsImportFragment(getParentFragment().getFragmentManager(), serviceId);
+        FragmentManager fragmentManager = getFM();
+        NavigationHelper.openSubscriptionsImportFragment(fragmentManager, serviceId);
    }

    private void onImportPreviousSelected() {
@@ -285,16 +328,19 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

+        final boolean useGrid = isGridLayout();
        infoListAdapter = new InfoListAdapter(getActivity());
        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(new LinearLayoutManager(activity));
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());

+        View headerRootLayout;
        infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
        whatsNewItemListHeader = headerRootLayout.findViewById(R.id.whats_new);
        importExportListHeader = headerRootLayout.findViewById(R.id.import_export);
        importExportOptions = headerRootLayout.findViewById(R.id.import_export_options);

        infoListAdapter.useMiniItemVariants(true);
+        infoListAdapter.setGridItemVariants(useGrid);
        itemsList.setAdapter(infoListAdapter);

        setupImportFromItems(headerRootLayout.findViewById(R.id.import_from_options));
@@ -318,20 +364,107 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        super.initListeners();

        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
-            @Override
+
            public void selected(ChannelInfoItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                final FragmentManager fragmentManager = getFM();
+                NavigationHelper.openChannelFragment(fragmentManager,
+                        selectedItem.getServiceId(),
+                        selectedItem.getUrl(),
+                        selectedItem.getName());
            }
+
+            public void held(ChannelInfoItem selectedItem) {
+                showLongTapDialog(selectedItem);
+            }
+
        });

-        //noinspection ConstantConditions
-        whatsNewItemListHeader.setOnClickListener(v ->
-                NavigationHelper.openWhatsNewFragment(getParentFragment().getFragmentManager()));
+        whatsNewItemListHeader.setOnClickListener(v -> {
+            FragmentManager fragmentManager = getFM();
+            NavigationHelper.openWhatsNewFragment(fragmentManager);
+        });
        importExportListHeader.setOnClickListener(v -> importExportOptions.switchState());
    }

+    private void showLongTapDialog(ChannelInfoItem selectedItem) {
+        final Context context = getContext();
+        final Activity activity = getActivity();
+        if (context == null || context.getResources() == null || getActivity() == null) return;
+
+        final String[] commands = new String[]{
+                context.getResources().getString(R.string.unsubscribe),
+                context.getResources().getString(R.string.share)
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    deleteChannel(selectedItem);
+                    break;
+                case 1:
+                    shareChannel(selectedItem);
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(selectedItem.getName());
+
+        TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        detailsView.setVisibility(View.GONE);
+
+        new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(commands, actions)
+                .create()
+                .show();
+
+    }
+
+    private void shareChannel(ChannelInfoItem selectedItem) {
+        ShareUtils.shareUrl(getContext(), selectedItem.getName(), selectedItem.getUrl());
+    }
+
+    @SuppressLint("CheckResult")
+    private void deleteChannel(ChannelInfoItem selectedItem) {
+        subscriptionService.subscriptionTable()
+                .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl())
+                .toObservable()
+                .observeOn(Schedulers.io())
+                .subscribe(getDeleteObserver());
+
+        Toast.makeText(activity, getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show();
+    }
+
+
+
+    private Observer<List<SubscriptionEntity>> getDeleteObserver() {
+        return new Observer<List<SubscriptionEntity>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                disposables.add(d);
+            }
+
+            @Override
+            public void onNext(List<SubscriptionEntity> subscriptionEntities) {
+                subscriptionService.subscriptionTable().delete(subscriptionEntities);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                SubscriptionFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {  }
+        };
+    }
+
    private void resetFragment() {
        if (disposables != null) disposables.clear();
        if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
@@ -399,10 +532,13 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt

    private List<InfoItem> getSubscriptionItems(List<SubscriptionEntity> subscriptions) {
        List<InfoItem> items = new ArrayList<>();
-        for (final SubscriptionEntity subscription : subscriptions) items.add(subscription.toChannelInfoItem());
+        for (final SubscriptionEntity subscription : subscriptions) {
+            items.add(subscription.toChannelInfoItem());
+        }

        Collections.sort(items,
-                (InfoItem o1, InfoItem o2) -> o1.getName().compareToIgnoreCase(o2.getName()));
+                (InfoItem o1, InfoItem o2) ->
+                        o1.getName().compareToIgnoreCase(o2.getName()));
        return items;
    }

@@ -431,7 +567,29 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        resetFragment();
        if (super.onError(exception)) return true;

-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Subscriptions", R.string.general_error);
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Subscriptions",
+                R.string.general_error);
        return true;
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/Show More
+++ b/Show More