Fixed serveral things:

* ugly workaround for the details_view_layout problem on older devices * removed "display button on the left side" option since it's not nececeay anymore.
Translated using Weblate (French)
2025-12-11 01:40:14 +00:00 · 2015-12-15 22:53:29 +01:00 · 2015-12-15 14:28:58 +01:00 · 2015-12-15 14:25:10 +01:00 · 2015-12-15 11:57:58 +01:00 · 2015-12-15 11:57:58 +01:00
113 changed files with 4434 additions and 1950 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
+.gitignore
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
+/app/app.iml
+/.idea
+/*.iml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-NewPipe
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/dictionaries/the_scrabi.xml
+++ b/.idea/dictionaries/the_scrabi.xml
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="the-scrabi" />
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/NewPipe.iml" filepath="$PROJECT_DIR$/NewPipe.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+language: android
+android:
+  components:
+    # The BuildTools version used by NewPipe
+    - build-tools-23.0.2
+
+    # The SDK version used to compile NewPipe
+    - android-23
+
+    # Additional components
+    - extra-android-support
+    - extra-android-m2repository
+
+    # Emulators
+    - sys-img-armeabi-v7a-android-21
+    - sys-img-armeabi-v7a-android-19
+    - sys-img-armeabi-v7a-android-15
+
+env:
+  global:
+    - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default)
+  matrix:
+    - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+
+before_script:
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
--- a/NewPipe.iml
+++ b/NewPipe.iml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="NewPipe" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/README.md
+++ b/README.md
@@ -1,9 +1,69 @@
-NewPipe
-------
+# NewPipe
+NewPipe: A free lightweight Youtube frontend for Android.  

-version 0.3
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://dasochan.nl/newpipe/)

+Project status:
+[![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
+[![Build Status](https://travis-ci.org/theScrabi/NewPipe.svg)](https://travis-ci.org/theScrabi/NewPipe)

-NewPipe is a lightweight youtube frontend for android. It's supposed to be used without the youtube-api and without any google play services. NewPipe only parses the youtube website in order to gain the information it needs.
+## Get NewPipe

-This a very early version of the app, so not all functionality is implemented, and there may still be a lot of bugs. But all in all it's doing what it is supposed to do. It makes it possible to watch youtube videos. So don't be cruel to this app. It will improve...
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+
+## Screenshots
+
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.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.
+
+### Features
+
+* Search videos
+* Display general information about a video
+* Watch YouTube videos
+* Listen to YouTube videos (audio only streaming)
+* Select the streaming player to watch the video with
+* Download videos (working, but it could be better)
+* Download audio only (working, but it could be better)
+* Open a video in Kodi
+* Show Next/Related videos
+* Search YouTube in a specific language
+
+### Coming Features
+
+* Improved Downloading
+* Bookmarks
+* View history
+* Search history
+* Search channels
+* Display general information about channels
+* Subscribe to channels
+* Watch videos from a channel
+* Search/Watch Playlists
+* ... and many more
+
+### Multiservice support
+Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.
+
+## Contribution
+Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
+The more is done the better it gets!
+
+Join our [Slack group](http://invite.chschtsch.ml/) if you like to get involved.
+
+## License
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe is Free Software: You can use, study share and improve it at your
+will. Specifically you can redistribute and/or modify it under the terms of the
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
+published by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.  
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,3 @@
+.gitignore
 /build
+app.iml
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="NewPipe" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
-  </component>
-</module>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"

    defaultConfig {
        applicationId "org.schabi.newpipe"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "0.3"
+        minSdkVersion 15
+        targetSdkVersion 23
+        versionCode 8
+        versionName "0.6.2"
    }
    buildTypes {
        release {
@@ -17,12 +17,22 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
+    
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 }

 dependencies {
    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
    compile 'org.jsoup:jsoup:1.8.3'
    compile 'org.mozilla:rhino:1.7.7'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    package="org.schabi.newpipe" >

-    <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <application
@@ -10,10 +11,11 @@
        android:icon="@mipmap/ic_launcher"
        android:logo="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup">
        <activity
            android:name=".VideoItemListActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@@ -22,7 +24,8 @@
        </activity>
        <activity
            android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail" >
+            android:label="@string/title_videoitem_detail"
+            android:theme="@style/AppTheme">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value=".VideoItemListActivity" />
@@ -34,33 +37,42 @@
                <data
                    android:host="youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="www.youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="www.youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="m.youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="m.youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="https"
+                    android:pathPrefix="/"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="http"
+                    android:pathPrefix="/"/>
            </intent-filter>
        </activity>
        <activity android:name=".PlayVideoActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullscreenTheme"
-            >
+            android:theme="@style/VideoPlayerTheme"
+            android:parentActivityName=".VideoItemDetailActivity"
+            tools:ignore="UnusedAttribute">
        </activity>
        <activity
            android:name=".SettingsActivity"
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
@@ -1,12 +1,11 @@
 package org.schabi.newpipe;

-import android.app.DownloadManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
+import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -16,8 +15,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;

-import java.io.File;
-
 /**
 * Created by Christian Schabesberger on 18.08.15.
 *
@@ -38,25 +35,23 @@ import java.io.File;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-public class ActionBarHandler {
-    private static final String TAG = ActionBarHandler.class.toString();
-    private static ActionBarHandler handler = null;

-    private Context context = null;
-    private String webisteUrl = "";
+class ActionBarHandler {
+    private static final String TAG = ActionBarHandler.class.toString();
+    private static final String KORE_PACKET = "org.xbmc.kore";
+
+    private String websiteUrl = "";
    private AppCompatActivity activity;
-    private VideoInfo.Stream[] streams = null;
+    private VideoInfo.VideoStream[] videoStreams = null;
+    private VideoInfo.AudioStream audioStream = null;
    private int selectedStream = -1;
    private String videoTitle = "";

-    public static ActionBarHandler getHandler() {
-        if(handler == null) {
-            handler = new ActionBarHandler();
-        }
-        return handler;
-    }
+    private SharedPreferences defaultPreferences = null;
+    private int startPosition;

-    class ForamatItemSelectListener implements ActionBar.OnNavigationListener {
+    @SuppressWarnings("deprecation")
+    private class FormatItemSelectListener implements ActionBar.OnNavigationListener {
        @Override
        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
            selectFormatItem((int)itemId);
@@ -64,24 +59,66 @@ public class ActionBarHandler {
        }
    }

-    public void setupNavMenu(AppCompatActivity activity) {
+    public ActionBarHandler(AppCompatActivity activity) {
        this.activity = activity;
-        activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
    }

-    public void setStreams(VideoInfo.Stream[] streams) {
-        this.streams = streams;
+    @SuppressWarnings({"deprecation", "ConstantConditions"})
+    public void setupNavMenu(AppCompatActivity activity) {
+        this.activity = activity;
+        try {
+            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        } catch(NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
+        this.videoStreams = videoStreams;
        selectedStream = 0;
-        String[] itemArray = new String[streams.length];
-        for(int i = 0; i < streams.length; i++) {
-            itemArray[i] = streams[i].format + " " + streams[i].resolution;
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        String[] itemArray = new String[videoStreams.length];
+        String defaultResolution = defaultPreferences
+                .getString(activity.getString(R.string.defaultResolutionPreference),
+                        activity.getString(R.string.defaultResolutionListItem));
+        int defaultResolutionPos = 0;
+
+        for(int i = 0; i < videoStreams.length; i++) {
+            itemArray[i] = MediaFormat.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
+            if(defaultResolution.equals(videoStreams[i].resolution)) {
+                defaultResolutionPos = i;
+            }
        }

-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<String>(activity.getBaseContext(),
+        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
                android.R.layout.simple_spinner_dropdown_item, itemArray);
        if(activity != null) {
-            activity.getSupportActionBar().setListNavigationCallbacks(itemAdapter
-                    ,new ForamatItemSelectListener());
+            ActionBar ab = activity.getSupportActionBar();
+                assert ab != null : "Could not get actionbar";
+                ab.setListNavigationCallbacks(itemAdapter
+                        , new FormatItemSelectListener());
+
+            ab.setSelectedNavigationItem(defaultResolutionPos);
+        }
+
+        // set audioStream
+        audioStream = null;
+        String preferedFormat = defaultPreferences
+                .getString(activity.getString(R.string.defaultAudioFormatPreference), "webm");
+        if(preferedFormat.equals("webm")) {
+            for(VideoInfo.AudioStream s : audioStreams) {
+                if(s.format == MediaFormat.WEBMA.id) {
+                    audioStream = s;
+                }
+            }
+        } else if(preferedFormat.equals("m4a")){
+            for(VideoInfo.AudioStream s : audioStreams) {
+                if(s.format == MediaFormat.M4A.id &&
+                        (audioStream == null || audioStream.bandwidth > s.bandwidth)) {
+                    audioStream = s;
+                }
+            }
        }
    }

@@ -89,83 +126,88 @@ public class ActionBarHandler {
        selectedStream = i;
    }

-    public boolean setupMenu(Menu menu, MenuInflater inflater, Context constext) {
-        this.context = context;
+    public void setupMenu(Menu menu, MenuInflater inflater) {
        // CAUTION set item properties programmatically otherwise it would not be accepted by
        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);

+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+
        inflater.inflate(R.menu.videoitem_detail, menu);
-        MenuItem playItem = menu.findItem(R.id.menu_item_play);
-        MenuItem shareItem = menu.findItem(R.id.menu_item_share);
+        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);

-        MenuItemCompat.setShowAsAction(playItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
-                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-        MenuItemCompat.setShowAsAction(shareItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
-                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-
-        return true;
+        castItem.setVisible(defaultPreferences
+                .getBoolean(activity.getString(R.string.showPlayWidthKodiPreference), false));
    }

-    public boolean onItemSelected(MenuItem item, Context context) {
-        this.context = context;
+    public boolean onItemSelected(MenuItem item) {
        int id = item.getItemId();
        switch(id) {
-            case R.id.menu_item_play:
-                playVideo();
-                break;
            case R.id.menu_item_share:
                if(!videoTitle.isEmpty()) {
                    Intent intent = new Intent();
                    intent.setAction(Intent.ACTION_SEND);
-                    intent.putExtra(Intent.EXTRA_TEXT, webisteUrl);
+                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
                    intent.setType("text/plain");
-                    context.startActivity(Intent.createChooser(intent, context.getString(R.string.shareDialogTitle)));
+                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.shareDialogTitle)));
                }
-                break;
+                return true;
            case R.id.menu_item_openInBrowser: {
                openInBrowser();
            }
-                break;
+                return true;
            case R.id.menu_item_download:
                downloadVideo();
-                break;
+                return true;
            case R.id.action_settings: {
-                Intent intent = new Intent(context, SettingsActivity.class);
-                context.startActivity(intent);
+                Intent intent = new Intent(activity, SettingsActivity.class);
+                activity.startActivity(intent);
            }
+            break;
+            case R.id.action_play_with_kodi:
+                playWithKodi();
+                return true;
+            case R.id.menu_item_play_audio:
+                playAudio();
+                return true;
            default:
                Log.e(TAG, "Menu Item not known");
        }
-        return true;
+        return false;
    }

    public void setVideoInfo(String websiteUrl, String videoTitle) {
-        this.webisteUrl = websiteUrl;
+        this.websiteUrl = websiteUrl;
        this.videoTitle = videoTitle;
    }

    public void playVideo() {
        // ----------- THE MAGIC MOMENT ---------------
        if(!videoTitle.isEmpty()) {
-            if (PreferenceManager.getDefaultSharedPreferences(context)
-                    .getBoolean("use_external_player", false)) {
+            if (PreferenceManager.getDefaultSharedPreferences(activity)
+                    .getBoolean(activity.getString(R.string.useExternalPlayer), false)) {
+
+                // External Player
                Intent intent = new Intent();
                try {
                    intent.setAction(Intent.ACTION_VIEW);
-                    intent.setDataAndType(Uri.parse(streams[selectedStream].url),
-                            "video/" + streams[selectedStream].format);
-                    context.startActivity(intent);      // HERE !!!
+
+                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
+                            MediaFormat.getMimeById(videoStreams[selectedStream].format));
+                    intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
+                    intent.putExtra("title", videoTitle);
+
+                    activity.startActivity(intent);      // HERE !!!
                } catch (Exception e) {
                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
                    builder.setMessage(R.string.noPlayerFound)
                            .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
                                @Override
                                public void onClick(DialogInterface dialog, int which) {
                                    Intent intent = new Intent();
                                    intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(context.getString(R.string.fdroidVLCurl)));
-                                    context.startActivity(intent);
+                                    intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
+                                    activity.startActivity(intent);
                                }
                            })
                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@@ -177,53 +219,111 @@ public class ActionBarHandler {
                    builder.create().show();
                }
            } else {
-                Intent intent = new Intent(context, PlayVideoActivity.class);
+                // Internal Player
+                Intent intent = new Intent(activity, PlayVideoActivity.class);
                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, streams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, webisteUrl);
-                context.startActivity(intent);
+                intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
+                intent.putExtra(PlayVideoActivity.VIDEO_URL, websiteUrl);
+                intent.putExtra(PlayVideoActivity.START_POSITION, startPosition);
+                activity.startActivity(intent);     //also HERE !!!
            }
        }
        // --------------------------------------------
    }

-    public void downloadVideo() {
-        Log.d(TAG, "bla");
+    public void setStartPosition(int startPositionSeconds)
+    {
+        this.startPosition = startPositionSeconds;
+    }
+
+    private void downloadVideo() {
        if(!videoTitle.isEmpty()) {
-            String suffix = "";
-            switch (streams[selectedStream].format) {
-                case VideoInfo.F_WEBM:
-                    suffix = ".webm";
-                    break;
-                case VideoInfo.F_MPEG_4:
-                    suffix = ".mp4";
-                    break;
-                case VideoInfo.F_3GPP:
-                    suffix = ".3gp";
-                    break;
-            }
-            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-            DownloadManager.Request request = new DownloadManager.Request(
-                    Uri.parse(streams[selectedStream].url));
-            request.setDestinationUri(Uri.fromFile(new File(
-                            PreferenceManager.getDefaultSharedPreferences(context)
-                            .getString("download_path_preference", "/storage/emulated/0/NewPipe")
-                            + "/" + videoTitle + suffix)));
-            try {
-                dm.enqueue(request);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            String videoSuffix = "." + MediaFormat.getSuffixById(videoStreams[selectedStream].format);
+            String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
+            Bundle args = new Bundle();
+            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
+            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
+            args.putString(DownloadDialog.TITLE, videoTitle);
+            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
+            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
+            DownloadDialog downloadDialog = new DownloadDialog();
+            downloadDialog.setArguments(args);
+            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
        }
    }

-    public void openInBrowser() {
+    private void openInBrowser() {
        if(!videoTitle.isEmpty()) {
            Intent intent = new Intent();
            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(webisteUrl));
+            intent.setData(Uri.parse(websiteUrl));

-            context.startActivity(Intent.createChooser(intent, context.getString(R.string.chooseBrowser)));
+            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.chooseBrowser)));
+        }
+    }
+
+    private void playWithKodi() {
+        if(!videoTitle.isEmpty()) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setPackage(KORE_PACKET);
+                intent.setData(Uri.parse(websiteUrl.replace("https", "http")));
+                activity.startActivity(intent);
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                builder.setMessage(R.string.koreNotFound)
+                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent();
+                                intent.setAction(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(activity.getString(R.string.fdroidKoreUrl)));
+                                activity.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+
+                            }
+                        });
+                builder.create().show();
+            }
+        }
+    }
+
+    private void playAudio() {
+        Intent intent = new Intent();
+        try {
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.setDataAndType(Uri.parse(audioStream.url),
+                    MediaFormat.getMimeById(audioStream.format));
+            intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
+            intent.putExtra("title", videoTitle);
+            activity.startActivity(intent);      // HERE !!!
+        } catch (Exception e) {
+            e.printStackTrace();
+            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+            builder.setMessage(R.string.noPlayerFound)
+                    .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            Intent intent = new Intent();
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
+                            activity.startActivity(intent);
+                        }
+                    })
+                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            Log.i(TAG, "You unlocked a secret unicorn.");
+                        }
+                    });
+            builder.create().show();
+            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
+            e.printStackTrace();
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
@@ -0,0 +1,91 @@
+package org.schabi.newpipe;
+
+import android.app.Dialog;
+import android.app.DownloadManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+
+import java.io.File;
+
+/**
+ * Created by Christian Schabesberger on 21.09.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DownloadDialog.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 DownloadDialog extends DialogFragment {
+    private static final String TAG = DialogFragment.class.getName();
+
+    public static final String TITLE = "name";
+    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
+    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
+    public static final String AUDIO_URL = "audio_url";
+    public static final String VIDEO_URL = "video_url";
+    private Bundle arguments;
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        arguments = getArguments();
+        super.onCreateDialog(savedInstanceState);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(R.string.downloadDialogTitle)
+                .setItems(R.array.downloadOptions, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Context context = getActivity();
+                        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                        String suffix = "";
+                        String title = arguments.getString(TITLE);
+                        String url = "";
+                        switch(which) {
+                            case 0:     // Video
+                                suffix = arguments.getString(FILE_SUFFIX_VIDEO);
+                                url = arguments.getString(VIDEO_URL);
+                                break;
+                            case 1:
+                                suffix = arguments.getString(FILE_SUFFIX_AUDIO);
+                                url = arguments.getString(AUDIO_URL);
+                                break;
+                            default:
+                                Log.d(TAG, "lolz");
+                        }
+                        DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                        DownloadManager.Request request = new DownloadManager.Request(
+                                Uri.parse(url));
+                        request.setDestinationUri(Uri.fromFile(new File(
+                                defaultPreferences.getString("download_path_preference", "/storage/emulated/0/NewPipe")
+                                        + "/" + title + suffix)));
+                        try {
+                            dm.enqueue(request);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+        return builder.create();
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe;

 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;

 /**
 * Created by Christian Schabesberger on 14.08.15.
@@ -28,12 +30,30 @@ import java.net.URL;
 public class Downloader {

    private static final String USER_AGENT = "Mozilla/5.0";
-    public static String download(String siteUrl) {

-        StringBuffer response = new StringBuffer();
+    /**Download the text file at the supplied URL as in download(String),
+     * 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
+     * @return the contents of the specified text file*/
+    public static String download(String siteUrl, String language) {
+        String ret = "";
        try {
            URL url = new URL(siteUrl);
            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            con.setRequestProperty("Accept-Language", language);
+            ret = dl(con);
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+    /**Common functionality between download(String url) and download(String url, String language)*/
+    private static String dl(HttpURLConnection con) throws IOException {
+        StringBuilder response = new StringBuilder();
+
+        try {
            con.setRequestMethod("GET");
            con.setRequestProperty("User-Agent", USER_AGENT);

@@ -45,9 +65,32 @@ public class Downloader {
                response.append(inputLine);
            }
            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
+
        }
+        catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            uhe.printStackTrace();
+            //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        }
+
        return response.toString();
    }
+
+/**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+ * Primarily intended for downloading web pages.
+ * @param siteUrl the URL of the text file to download
+ * @return the contents of the specified text file*/
+    public static String download(String siteUrl) {
+        String ret = "";
+
+        try {
+            URL url = new URL(siteUrl);
+            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            ret = dl(con);
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+
+        return ret;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/Extractor.java
+++ b/app/src/main/java/org/schabi/newpipe/Extractor.java
@@ -1,30 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * Extractor.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 interface Extractor {
-    VideoInfo getVideoInfo(String siteUrl);
-    String getVideoUrl(String videoId);
-    String getVideoId(String videoUrl);
-}
--- a/app/src/main/java/org/schabi/newpipe/MediaFormat.java
+++ b/app/src/main/java/org/schabi/newpipe/MediaFormat.java
@@ -0,0 +1,81 @@
+package org.schabi.newpipe;
+
+/**
+ * Created by Adam Howard on 08/11/15.
+ *
+ * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
+ *     and Adam Howard <achdisposable1@gmail.com> 2015
+ *
+ * VideoListAdapter.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/>.
+ */
+
+/**Static data about various media formats support by Newpipe, eg mime type, extension*/
+
+public enum MediaFormat {
+    //           id      name    suffix  mime type
+    MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
+    v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
+    WEBM        (0x2,   "WebM",  "webm", "video/webm"),
+    M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
+    WEBMA       (0x4,   "WebM",  "webm", "audio/webm");
+
+    public final int id;
+    @SuppressWarnings("WeakerAccess")
+    public final String name;
+    @SuppressWarnings("WeakerAccess")
+    public final String suffix;
+    public final String mimeType;
+
+    MediaFormat(int id, String name, String suffix, String mimeType) {
+        this.id = id;
+        this.name = name;
+        this.suffix = suffix;
+        this.mimeType = mimeType;
+    }
+
+    /**Return the friendly name of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the friendly name of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getNameById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.name;
+        }
+        return "";
+    }
+
+    /**Return the file extension of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the file extension of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getSuffixById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.suffix;
+        }
+        return "";
+    }
+
+    /**Return the MIME type of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the MIME type of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getMimeById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.mimeType;
+        }
+        return "";
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -1,19 +1,24 @@
 package org.schabi.newpipe;

+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.Surface;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
@@ -41,11 +46,14 @@ import android.widget.VideoView;

 public class PlayVideoActivity extends AppCompatActivity {

+    //// TODO: 11.09.15 add "choose stream" menu 
+    
    private static final String TAG = PlayVideoActivity.class.toString();
    public static final String VIDEO_URL = "video_url";
    public static final String STREAM_URL = "stream_url";
    public static final String VIDEO_TITLE = "video_title";
    private static final String POSITION = "position";
+    public static final String START_POSITION = "start_position";

    private static final long HIDING_DELAY = 3000;

@@ -59,6 +67,11 @@ public class PlayVideoActivity extends AppCompatActivity {
    private View decorView;
    private boolean uiIsHidden = false;
    private static long lastUiShowTime = 0;
+    private boolean isLandscape = true;
+    private boolean hasSoftKeys = false;
+
+    private SharedPreferences prefs;
+    private static final String PREF_IS_LANDSCAPE = "is_landscape";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -66,13 +79,42 @@ public class PlayVideoActivity extends AppCompatActivity {

        setContentView(R.layout.activity_play_video);

+        isLandscape = checkIfLandscape();
+        hasSoftKeys = checkIfHasSoftKeys();
+
        actionBar = getSupportActionBar();
+        assert actionBar != null;
        actionBar.setDisplayHomeAsUpEnabled(true);
        Intent intent = getIntent();
        if(mediaController == null) {
-            mediaController = new MediaController(this);
+            //prevents back button hiding media controller controls (after showing them)
+            //instead of exiting video
+            //see http://stackoverflow.com/questions/6051825
+            //also solves https://github.com/theScrabi/NewPipe/issues/99
+            mediaController = new MediaController(this) {
+                @Override
+                public boolean dispatchKeyEvent(KeyEvent event) {
+                    int keyCode = event.getKeyCode();
+                    final boolean uniqueDown = event.getRepeatCount() == 0
+                            && event.getAction() == KeyEvent.ACTION_DOWN;
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        if (uniqueDown)
+                        {
+                            if (isShowing()) {
+                                finish();
+                            } else {
+                                hide();
+                            }
+                        }
+                        return true;
+                    }
+                    return super.dispatchKeyEvent(event);
+                }
+            };
        }

+        position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
+
        videoView = (VideoView) findViewById(R.id.video_view);
        progressBar = (ProgressBar) findViewById(R.id.play_video_progress_bar);
        try {
@@ -89,6 +131,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                videoView.seekTo(position);
                if (position == 0) {
                    videoView.start();
+                    showUi();
                } else {
                    videoView.pause();
                }
@@ -111,16 +154,22 @@ public class PlayVideoActivity extends AppCompatActivity {
        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
            @Override
            public void onSystemUiVisibilityChange(int visibility) {
-                if((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-                    uiIsHidden = false;
+                if (visibility == View.VISIBLE && uiIsHidden) {
                    showUi();
-                } else {
-                    uiIsHidden = true;
-                    hideUi();
                }
            }
        });
-        hideUi();
+
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
+
+        prefs = getPreferences(Context.MODE_PRIVATE);
+        if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
+            toggleOrientation();
+        }
    }

    @Override
@@ -132,6 +181,12 @@ public class PlayVideoActivity extends AppCompatActivity {
        return true;
    }

+    @Override
+    public void onPause() {
+        super.onPause();
+        videoView.pause();
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();
@@ -147,14 +202,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
                break;
            case R.id.menu_item_screen_rotation:
-                Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
-                if(display.getRotation() == Surface.ROTATION_0
-                        || display.getRotation() == Surface.ROTATION_180) {
-                    setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                } else if(display.getRotation() == Surface.ROTATION_90
-                        || display.getRotation() == Surface.ROTATION_270) {
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                }
+                toggleOrientation();
                break;
            default:
                Log.e(TAG, "Error: MenuItem not known");
@@ -164,8 +212,16 @@ public class PlayVideoActivity extends AppCompatActivity {
    }

    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
+    public void onConfigurationChanged(Configuration config) {
+        super.onConfigurationChanged(config);
+
+        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            isLandscape = true;
+            adjustMediaControlMetrics();
+        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
+            isLandscape = false;
+            adjustMediaControlMetrics();
+        }
    }

    @Override
@@ -185,15 +241,15 @@ public class PlayVideoActivity extends AppCompatActivity {
    private void showUi() {
        try {
            uiIsHidden = false;
-            mediaController.show();
+            mediaController.show(100000);
            actionBar.show();
-            //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-            //| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+            adjustMediaControlMetrics();
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
            Handler handler = new Handler();
            handler.postDelayed(new Runnable() {
                @Override
                public void run() {
-                    if ((System.currentTimeMillis() - lastUiShowTime) > HIDING_DELAY) {
+                    if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
                        hideUi();
                    }
                }
@@ -208,8 +264,88 @@ public class PlayVideoActivity extends AppCompatActivity {
        uiIsHidden = true;
        actionBar.hide();
        mediaController.hide();
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
-        //| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
+
+    private void adjustMediaControlMetrics() {
+        MediaController.LayoutParams mediaControllerLayout
+                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
+                MediaController.LayoutParams.WRAP_CONTENT);
+
+        if(!hasSoftKeys) {
+            mediaControllerLayout.setMargins(20, 0, 20, 20);
+        } else {
+            int width = getNavigationBarWidth();
+            int height = getNavigationBarHeight();
+            mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
+        }
+        mediaController.setLayoutParams(mediaControllerLayout);
+    }
+
+    private boolean checkIfHasSoftKeys(){
+        return Build.VERSION.SDK_INT >= 17 ||
+                getNavigationBarHeight() != 0 ||
+                getNavigationBarWidth() != 0;
+    }
+
+    private int getNavigationBarHeight() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realHeight = realDisplayMetrics.heightPixels;
+            int displayHeight = displayMetrics.heightPixels;
+            return (realHeight - displayHeight);
+        } else {
+            return 50;
+        }
+    }
+
+    private int getNavigationBarWidth() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realWidth = realDisplayMetrics.widthPixels;
+            int displayWidth = displayMetrics.widthPixels;
+            return (realWidth - displayWidth);
+        } else {
+            return 50;
+        }
+    }
+
+    private boolean checkIfLandscape() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+    }
+
+    private void toggleOrientation() {
+        if(isLandscape)  {
+            isLandscape = false;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else {
+            isLandscape = true;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
+        editor.apply();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
@@ -9,10 +9,9 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -70,14 +69,11 @@ public class SettingsActivity extends PreferenceActivity {
        getDelegate().onPostCreate(savedInstanceState);
    }

-    public ActionBar getSupportActionBar() {
+    private ActionBar getSupportActionBar() {
        return getDelegate().getSupportActionBar();
    }

-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
+    @NonNull
    @Override
    public MenuInflater getMenuInflater() {
        return getDelegate().getMenuInflater();
@@ -162,7 +158,7 @@ public class SettingsActivity extends PreferenceActivity {
                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
            spEditor.putString(context.getString(R.string.downloadPathPreference)
                    , newPipeDownloadStorage);
-            spEditor.commit();
+            spEditor.apply();
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -1,5 +1,9 @@
 package org.schabi.newpipe;

+import org.schabi.newpipe.services.AbstractVideoInfo;
+
+import java.util.List;
+
 /**
 * Created by Christian Schabesberger on 26.08.15.
 *
@@ -20,47 +24,78 @@ package org.schabi.newpipe;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-import android.graphics.Bitmap;
+/**Info object for opened videos, ie the video ready to play.*/
+@SuppressWarnings("ALL")
+public class VideoInfo extends AbstractVideoInfo {

-import java.util.Vector;
+    public String uploader_thumbnail_url = "";
+    public String description = "";
+    public VideoStream[] videoStreams = null;
+    public AudioStream[] audioStreams = null;
+    public int videoAvailableStatus = VIDEO_AVAILABLE;
+    public int duration = -1;

-public class VideoInfo {
-
-    public static final String F_MPEG_4 = "MPEG-4";
-    public static final String F_3GPP = "3GPP";
-    public static final String F_WEBM = "WebM";
+    /*YouTube-specific fields
+    todo: move these to a subclass*/
+    public int age_limit = 0;
+    public int like_count = -1;
+    public int dislike_count = -1;
+    public String average_rating = "";
+    public VideoPreviewInfo nextVideo = null;
+    public List<VideoPreviewInfo> relatedVideos = null;
+    public int startPosition = -1;//in seconds. some metadata is not passed using a VideoInfo object!

    public static final int VIDEO_AVAILABLE = 0x00;
    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;
+    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation

-    public static class Stream {
-        public Stream(String u, String f, String r) {
-            url = u; format = f; resolution = r;
+
+    public VideoInfo() {}
+
+
+    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
+     * All the shared properties are copied to the new VideoInfo.*/
+    @SuppressWarnings("WeakerAccess")
+    public VideoInfo(AbstractVideoInfo avi) {
+        this.id = avi.id;
+        this.title = avi.title;
+        this.uploader = avi.uploader;
+        this.thumbnail_url = avi.thumbnail_url;
+        this.thumbnail = avi.thumbnail;
+        this.webpage_url = avi.webpage_url;
+        this.upload_date = avi.upload_date;
+        this.upload_date = avi.upload_date;
+        this.view_count = avi.view_count;
+
+        //todo: better than this
+        if(avi instanceof VideoPreviewInfo) {//shitty String to convert code
+            String dur = ((VideoPreviewInfo)avi).duration;
+            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
+            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
+            this.duration = (minutes*60)+seconds;
        }
-        public String url = "";     //url of the stream
-        public String format = "";
-        public String resolution = "";
    }

-    public String id = "";
-    public String uploader = "";
-    public String upload_date = "";
-    public String uploader_thumbnail_url = "";
-    public Bitmap uploader_thumbnail = null;
-    public String title = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String description = "";
-    public int duration = -1;
-    public int age_limit = 0;
-    public String webpage_url = "";
-    public String view_count = "";
-    public String like_count = "";
-    public String dislike_count = "";
-    public String average_rating = "";
-    public Stream[] streams = null;
-    public VideoInfoItem nextVideo = null;
-    public Vector<VideoInfoItem> relatedVideos = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
+    public static class VideoStream {
+        public String url = "";     //url of the stream
+        public int format = -1;
+        public String resolution = "";
+
+        public VideoStream(String url, int format, String res) {
+            this.url = url; this.format = format; resolution = res;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public static class AudioStream {
+        public String url = "";
+        public int format = -1;
+        public int bandwidth = -1;
+        public int samplingRate = -1;
+
+        public AudioStream(String url, int format, int bandwidth, int samplingRate) {
+            this.url = url; this.format = format;
+            this.bandwidth = bandwidth; this.samplingRate = samplingRate;
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItem.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItem.java
@@ -1,33 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItem.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 VideoInfoItem {
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    public String duration = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String webpage_url = "";
-}
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -0,0 +1,74 @@
+package org.schabi.newpipe;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Created by Christian Schabesberger on 24.10.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoInfoItemViewCreator.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/>.
+ */
+
+class VideoInfoItemViewCreator {
+    private final LayoutInflater inflater;
+
+    public VideoInfoItemViewCreator(LayoutInflater inflater) {
+        this.inflater = inflater;
+    }
+
+    public View getViewByVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info) {
+        ViewHolder holder;
+        if(convertView == null) {
+            convertView = inflater.inflate(R.layout.video_item, parent, false);
+            holder = new ViewHolder();
+            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
+            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
+            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
+            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
+            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+
+        if(info.thumbnail == null) {
+            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
+        } else {
+            holder.itemThumbnailView.setImageBitmap(info.thumbnail);
+        }
+        holder.itemVideoTitleView.setText(info.title);
+        holder.itemUploaderView.setText(info.uploader);
+        holder.itemDurationView.setText(info.duration);
+        if(!info.upload_date.isEmpty()) {
+            holder.itemUploadDateView.setText(info.upload_date);
+        } else {
+            //tweak if necessary: This is a hack to prevent having white space in the layout :P
+            holder.itemUploadDateView.setText(String.format("%d", info.view_count));
+        }
+
+        return convertView;
+    }
+
+    private class ViewHolder {
+        public ImageView itemThumbnailView;
+        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -1,22 +1,22 @@
 package org.schabi.newpipe;

-import android.content.ContentProviderOperation;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;

-import org.schabi.newpipe.youtube.YoutubeExtractor;
+import org.schabi.newpipe.services.ServiceList;
+import org.schabi.newpipe.services.StreamingService;


 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * ActionBarHandler.java is part of NewPipe.
+ * VideoItemDetailActivity.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
@@ -36,6 +36,8 @@ public class VideoItemDetailActivity extends AppCompatActivity {

    private static final String TAG = VideoItemDetailActivity.class.toString();

+    private VideoItemDetailFragment fragment;
+
    private String videoUrl;
    private int currentStreamingService = -1;

@@ -43,10 +45,14 @@ public class VideoItemDetailActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videoitem_detail);

-
        // Show the Up button in the action bar.
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        ActionBarHandler.getHandler().setupNavMenu(this);
+        try {
+            //noinspection ConstantConditions
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        } catch(Exception e) {
+            Log.d(TAG, "Could not get SupportActionBar");
+            e.printStackTrace();
+        }

        // savedInstanceState is non-null when there is fragment state
        // saved from previous configurations of this activity
@@ -60,40 +66,58 @@ public class VideoItemDetailActivity extends AppCompatActivity {

        Bundle arguments = new Bundle();
        if (savedInstanceState == null) {
-            // Create the detail fragment and add it to the activity
-            // using a fragment transaction.
+            // this means the video was called though another app
            if (getIntent().getData() != null) {
                videoUrl = getIntent().getData().toString();
                StreamingService[] serviceList = ServiceList.getServices();
-                Extractor extractor = null;
+                //VideoExtractor videoExtractor = null;
                for (int i = 0; i < serviceList.length; i++) {
                    if (serviceList[i].acceptUrl(videoUrl)) {
                        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
-                        try {
-                            currentStreamingService = i;
-                            extractor = (Extractor) ServiceList.getService(i)
-                                    .getExtractorClass().newInstance();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                        currentStreamingService = i;
+                        //videoExtractor = ServiceList.getService(i).getExtractorInstance();
                        break;
                    }
                }
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                        extractor.getVideoUrl(extractor.getVideoId(videoUrl)));
+                if(currentStreamingService == -1) {
+                    Toast.makeText(this, R.string.urlNotSupportedText, Toast.LENGTH_LONG)
+                            .show();
+                }
+                //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
+                //        videoExtractor.getVideoUrl(videoExtractor.getVideoId(videoUrl)));//cleans URL
+                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);

+                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
+                        PreferenceManager.getDefaultSharedPreferences(this)
+                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
            } else {
                videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
                currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
                arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
            }
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.videoitem_detail_container, fragment)
-                    .commit();
+
+        } else {
+            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
+            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
+            arguments = savedInstanceState;
        }
+
+        // Create the detail fragment and add it to the activity
+        // using a fragment transaction.
+        fragment = new VideoItemDetailFragment();
+        fragment.setArguments(arguments);
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.videoitem_detail_container, fragment)
+                .commit();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
+        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
    }

    @Override
@@ -104,25 +128,23 @@ public class VideoItemDetailActivity extends AppCompatActivity {
            // activity, the Up button is shown. Use NavUtils to allow users
            // to navigate up one level in the application structure. For
            // more details, see the Navigation pattern on Android Design:
-            //
+
            // http://developer.android.com/design/patterns/navigation.html#up-vs-back
-            //
+
            Intent intent = new Intent(this, VideoItemListActivity.class);
            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
            NavUtils.navigateUpTo(this, intent);
            return true;
        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
+            return fragment.onOptionsItemSelected(item) ||
+                    super.onOptionsItemSelected(item);
        }
-        return super.onOptionsItemSelected(item);
    }

    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
-
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        fragment.onCreateOptionsMenu(menu, getMenuInflater());
        return true;
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -1,27 +1,51 @@
 package org.schabi.newpipe;

+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.media.Image;
+import android.graphics.Point;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.util.DisplayMetrics;
 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.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
-
+import android.view.MenuItem;

 import java.net.URL;
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
 import java.util.Vector;

+import org.schabi.newpipe.services.VideoExtractor;
+import org.schabi.newpipe.services.ServiceList;
+import org.schabi.newpipe.services.StreamingService;
+

 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -52,34 +76,62 @@ public class VideoItemDetailFragment extends Fragment {
    public static final String ARG_ITEM_ID = "item_id";
    public static final String VIDEO_URL = "video_url";
    public static final String STREAMING_SERVICE = "streaming_service";
+    public static final String AUTO_PLAY = "auto_play";

-    private Thread extractorThread = null;
+    private AppCompatActivity activity;
+    private ActionBarHandler actionBarHandler;

-    private class ExtractorRunnable implements Runnable {
-        private Handler h = new Handler();
-        private Class extractorClass;
-        private String videoUrl;
-        public ExtractorRunnable(String videoUrl, Class extractorClass, VideoItemDetailFragment f) {
-            this.extractorClass = extractorClass;
+    private boolean autoPlayEnabled = false;
+    private VideoInfo currentVideoInfo = null;
+    private boolean showNextVideoItem = false;
+
+    private View thumbnailWindowLayout;
+    private FloatingActionButton playVideoButton;
+    private final Point initialThumbnailPos = new Point(0, 0);
+
+    public interface OnInvokeCreateOptionsMenuListener {
+        void createOptionsMenu();
+    }
+
+    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener = null;
+
+    private class VideoExtractorRunnable implements Runnable {
+        private final Handler h = new Handler();
+        private VideoExtractor videoExtractor;
+        private final StreamingService service;
+        private final String videoUrl;
+
+        public VideoExtractorRunnable(String videoUrl, StreamingService service) {
+            this.service = service;
            this.videoUrl = videoUrl;
        }
        @Override
        public void run() {
            try {
-                Extractor extractor = (Extractor) extractorClass.newInstance();
-                VideoInfo videoInfo = extractor.getVideoInfo(videoUrl);
+                this.videoExtractor = service.getExtractorInstance(videoUrl);
+                VideoInfo videoInfo = videoExtractor.getVideoInfo();
                h.post(new VideoResultReturnedRunnable(videoInfo));
                if (videoInfo.videoAvailableStatus == VideoInfo.VIDEO_AVAILABLE) {
                    h.post(new SetThumbnailRunnable(
                            BitmapFactory.decodeStream(
                                    new URL(videoInfo.thumbnail_url)
                                            .openConnection()
-                                            .getInputStream()), SetThumbnailRunnable.VIDEO_THUMBNAIL));
+                                            .getInputStream()),
+                            SetThumbnailRunnable.VIDEO_THUMBNAIL));
                    h.post(new SetThumbnailRunnable(
                            BitmapFactory.decodeStream(
                                    new URL(videoInfo.uploader_thumbnail_url)
                                            .openConnection()
-                                            .getInputStream()), SetThumbnailRunnable.CHANNEL_THUMBNAIL));
+                                            .getInputStream()),
+                            SetThumbnailRunnable.CHANNEL_THUMBNAIL));
+                    if(showNextVideoItem) {
+                        h.post(new SetThumbnailRunnable(
+                                BitmapFactory.decodeStream(
+                                        new URL(videoInfo.nextVideo.thumbnail_url)
+                                                .openConnection()
+                                                .getInputStream()),
+                                SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL));
+                    }
                }
            } catch (Exception e) {
                e.printStackTrace();
@@ -89,21 +141,24 @@ public class VideoItemDetailFragment extends Fragment {
    }

    private class VideoResultReturnedRunnable implements Runnable {
-        private VideoInfo videoInfo;
+        private final VideoInfo videoInfo;
        public VideoResultReturnedRunnable(VideoInfo videoInfo) {
            this.videoInfo = videoInfo;
        }
        @Override
        public void run() {
+            //todo: fix expired thread error:
+            // If the thread calling this runnable is expired, the following function will crash.
            updateInfo(videoInfo);
        }
    }

    private class SetThumbnailRunnable implements Runnable {
-        public static final int CHANNEL_THUMBNAIL = 2;
        public static final int VIDEO_THUMBNAIL = 1;
-        private Bitmap thumbnail;
-        private int thumbnailId;
+        public static final int CHANNEL_THUMBNAIL = 2;
+        public static final int NEXT_VIDEO_THUMBNAIL = 3;
+        private final Bitmap thumbnail;
+        private final int thumbnailId;
        public SetThumbnailRunnable(Bitmap thumbnail, int id) {
            this.thumbnail = thumbnail;
            this.thumbnailId = id;
@@ -114,106 +169,158 @@ public class VideoItemDetailFragment extends Fragment {
        }
    }

-    public void updateThumbnail(Bitmap thumbnail, int id) {
+    private void updateThumbnail(Bitmap thumbnail, int id) {
        Activity a = getActivity();
-        ImageView thumbnailView = null;
+        ImageView thumbnailView;
        try {
            switch (id) {
                case SetThumbnailRunnable.VIDEO_THUMBNAIL:
-
                    thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
                    break;
                case SetThumbnailRunnable.CHANNEL_THUMBNAIL:
                    thumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
                    break;
+                case SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL:
+                    FrameLayout nextVideoFrame = (FrameLayout) a.findViewById(R.id.detailNextVideoFrame);
+                    thumbnailView = (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
+                    currentVideoInfo.nextVideo.thumbnail = thumbnail;
+                    break;
                default:
                    Log.d(TAG, "Error: Thumbnail id not known");
                    return;
            }
+
            if (thumbnailView != null) {
                thumbnailView.setImageBitmap(thumbnail);
            }
+
        } catch (java.lang.NullPointerException e) {
-            // No god programm design i know. :/
+            // Not good program design, I know. :/
            Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
        }
    }

-    public void updateInfo(VideoInfo info) {
-        Activity a = getActivity();
+    private void updateInfo(VideoInfo info) {
+        currentVideoInfo = info;
+        Resources res = activity.getResources();
        try {
-            ProgressBar progressBar = (ProgressBar) a.findViewById(R.id.detailProgressBar);
-            TextView videoTitleView = (TextView) a.findViewById(R.id.detailVideoTitleView);
-            TextView uploaderView = (TextView) a.findViewById(R.id.detailUploaderView);
-            TextView viewCountView = (TextView) a.findViewById(R.id.detailViewCountView);
-            TextView thumbsUpView = (TextView) a.findViewById(R.id.detailThumbsUpCountView);
-            TextView thumbsDownView = (TextView) a.findViewById(R.id.detailThumbsDownCountView);
-            TextView uploadDateView = (TextView) a.findViewById(R.id.detailUploadDateView);
-            TextView descriptionView = (TextView) a.findViewById(R.id.detailDescriptionView);
-            ImageView thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
-            ImageView uploaderThumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
-            ImageView thumbsUpPic = (ImageView) a.findViewById(R.id.detailThumbsUpImgView);
-            ImageView thumbsDownPic = (ImageView) a.findViewById(R.id.detailThumbsDownImgView);
+            VideoInfoItemViewCreator videoItemViewCreator =
+                    new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));

+            RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
+            ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
+            TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
+            TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
+            TextView viewCountView = (TextView) activity.findViewById(R.id.detailViewCountView);
+            TextView thumbsUpView = (TextView) activity.findViewById(R.id.detailThumbsUpCountView);
+            TextView thumbsDownView = (TextView) activity.findViewById(R.id.detailThumbsDownCountView);
+            TextView uploadDateView = (TextView) activity.findViewById(R.id.detailUploadDateView);
+            TextView descriptionView = (TextView) activity.findViewById(R.id.detailDescriptionView);
+            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+            FrameLayout nextVideoFrame = (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
+            RelativeLayout nextVideoRootFrame =
+                    (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
+            View nextVideoView = videoItemViewCreator
+                    .getViewByVideoInfoItem(null, nextVideoFrame, info.nextVideo);
+            nextVideoFrame.addView(nextVideoView);
+            Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
+            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
+
+            textContentLayout.setVisibility(View.VISIBLE);
+            playVideoButton.setVisibility(View.VISIBLE);
            progressBar.setVisibility(View.GONE);
-            videoTitleView.setVisibility(View.VISIBLE);
-            uploaderView.setVisibility(View.VISIBLE);
-            uploadDateView.setVisibility(View.VISIBLE);
-            viewCountView.setVisibility(View.VISIBLE);
-            thumbsUpView.setVisibility(View.VISIBLE);
-            thumbsDownView.setVisibility(View.VISIBLE);
-            uploadDateView.setVisibility(View.VISIBLE);
-            descriptionView.setVisibility(View.VISIBLE);
-            thumbnailView.setVisibility(View.VISIBLE);
-            uploaderThumbnailView.setVisibility(View.VISIBLE);
-            thumbsUpPic.setVisibility(View.VISIBLE);
-            thumbsDownPic.setVisibility(View.VISIBLE);
+            if(!showNextVideoItem) {
+                nextVideoRootFrame.setVisibility(View.GONE);
+                similarVideosButton.setVisibility(View.GONE);
+            }

            switch (info.videoAvailableStatus) {
                case VideoInfo.VIDEO_AVAILABLE: {
                    videoTitleView.setText(info.title);
                    uploaderView.setText(info.uploader);
-                    viewCountView.setText(info.view_count + " " + a.getString(R.string.viewSufix));
-                    thumbsUpView.setText(info.like_count);
-                    thumbsDownView.setText(info.dislike_count);
-                    uploadDateView.setText(a.getString(R.string.uploadDatePrefix) + " " + info.upload_date);
+
+                    Locale locale = getPreferredLocale();
+                    NumberFormat nf = NumberFormat.getInstance(locale);
+                    String localisedViewCount = nf.format(info.view_count);
+                    viewCountView.setText(
+                            String.format(
+                                    res.getString(R.string.viewCountText), localisedViewCount));
+
+                    thumbsUpView.setText(nf.format(info.like_count));
+                    thumbsDownView.setText(nf.format(info.dislike_count));
+
+                    @SuppressLint("SimpleDateFormat")
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+                    Date datum = null;
+                    try {
+                        datum = formatter.parse(info.upload_date);
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+
+                    DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+
+                    String localisedDate = df.format(datum);
+                    uploadDateView.setText(
+                            String.format(res.getString(R.string.uploadDateText), localisedDate));
                    descriptionView.setText(Html.fromHtml(info.description));
                    descriptionView.setMovementMethod(LinkMovementMethod.getInstance());

-                    ActionBarHandler.getHandler().setVideoInfo(info.webpage_url, info.title);
+                    actionBarHandler.setVideoInfo(info.webpage_url, info.title);
+                    actionBarHandler.setStartPosition(info.startPosition);

                    // parse streams
-                    Vector<VideoInfo.Stream> streamsToUse = new Vector<>();
-                    for (VideoInfo.Stream i : info.streams) {
+                    Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
+                    for (VideoInfo.VideoStream i : info.videoStreams) {
                        if (useStream(i, streamsToUse)) {
                            streamsToUse.add(i);
                        }
                    }
-                    VideoInfo.Stream[] streamList = new VideoInfo.Stream[streamsToUse.size()];
+                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
                    for (int i = 0; i < streamList.length; i++) {
                        streamList[i] = streamsToUse.get(i);
                    }
-                    ActionBarHandler.getHandler().setStreams(streamList);
+                    actionBarHandler.setStreams(streamList, info.audioStreams);
                }
-                    break;
+
+                nextVideoButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent detailIntent =
+                                new Intent(getActivity(), VideoItemDetailActivity.class);
+                        detailIntent.putExtra(
+                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id);
+                        detailIntent.putExtra(
+                                VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
+                        //todo: make id dynamic the following line is crap
+                        detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, 0);
+                        startActivity(detailIntent);
+                    }
+                });
+                break;
                case VideoInfo.VIDEO_UNAVAILABLE_GEMA:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.gruese_die_gema_unangebracht));
+                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                            getResources(), R.drawable.gruese_die_gema_unangebracht));
                    break;
                case VideoInfo.VIDEO_UNAVAILABLE:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.not_available_monkey));
+                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                            getResources(), R.drawable.not_available_monkey));
                    break;
                default:
-                    Log.e(TAG, "Video Availeble Status not known.");
+                    Log.e(TAG, "Video Available Status not known.");
            }

+            if(autoPlayEnabled) {
+                actionBarHandler.playVideo();
+            }
        } catch (java.lang.NullPointerException e) {
            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
            e.printStackTrace();
        }
    }

-    private boolean useStream(VideoInfo.Stream stream, Vector<VideoInfo.Stream> streams) {
-        for(VideoInfo.Stream i : streams) {
+    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
+        for(VideoInfo.VideoStream i : streams) {
            if(i.resolution.equals(stream.resolution)) {
                return false;
            }
@@ -225,28 +332,147 @@ public class VideoItemDetailFragment extends Fragment {
     * Mandatory empty constructor for the fragment manager to instantiate the
     * fragment (e.g. upon screen orientation changes).
     */
-    public VideoItemDetailFragment() {
-    }

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        try {
-            StreamingService streamingService = ServiceList.getService(
-                    getArguments().getInt(STREAMING_SERVICE));
-            extractorThread = new Thread(new ExtractorRunnable(
-                    getArguments().getString(VIDEO_URL), streamingService.getExtractorClass(), this));
-            extractorThread.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        activity = (AppCompatActivity) getActivity();
+        showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getBoolean(activity.getString(R.string.showNextVideo), true);
+
    }

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
+        actionBarHandler = new ActionBarHandler(activity);
+        actionBarHandler.setupNavMenu(activity);
+        if(onInvokeCreateOptionsMenuListener != null) {
+            onInvokeCreateOptionsMenuListener.createOptionsMenu();
+        }

        return rootView;
    }
-}
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceBundle) {
+        super.onActivityCreated(savedInstanceBundle);
+        Activity a = getActivity();
+        playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton);
+        thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
+        Button backgroundButton = (Button)
+                a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
+
+        // Sometimes when this fragment is not visible it still gets initiated
+        // then we must not try to access objects of this fragment.
+        // Otherwise the applications would crash.
+        if(playVideoButton != null) {
+            try {
+                StreamingService streamingService = ServiceList.getService(
+                        getArguments().getInt(STREAMING_SERVICE));
+                Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
+                        getArguments().getString(VIDEO_URL), streamingService));
+
+                autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
+                videoExtractorThread.start();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            playVideoButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    actionBarHandler.playVideo();
+                }
+            });
+
+            backgroundButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    actionBarHandler.playVideo();
+                }
+            });
+
+            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
+            similarVideosButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(activity, VideoItemListActivity.class);
+                    //todo: find more elegant way to do this - converting from List to ArrayList sucks
+                    ArrayList<VideoPreviewInfo> toParcel = new ArrayList<>(currentVideoInfo.relatedVideos);
+                    //why oh why does the parcelable array put method have to be so damn specific
+                    // about the class of its argument?
+                    //why not a List<? extends Parcelable>?
+                    intent.putParcelableArrayListExtra(VideoItemListActivity.VIDEO_INFO_ITEMS, toParcel);
+                    activity.startActivity(intent);
+                }
+            });
+
+            // todo: Fix this workaround (probably with a better design), so that older android
+            // versions don't have problems rendering the thumbnail right.
+            if(Build.VERSION.SDK_INT >= 18) {
+                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+                    // inside the ScrollView with the actual size of the thumbnail.
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        RelativeLayout.LayoutParams newWindowLayoutParams =
+                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                        newWindowLayoutParams.height = bottom - top;
+                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+
+                        //noinspection SuspiciousNameCombination
+                        initialThumbnailPos.set(top, left);
+
+                    }
+                });
+            }
+        }
+    }
+
+
+
+    /**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences.
+     * Currently not affected by the device's locale.*/
+    private Locale getPreferredLocale() {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+        String languageKey = getContext().getString(R.string.searchLanguage);
+        //i know the following line defaults languageCode to "en", but java is picky about uninitialised values
+        // Schabi: well lint tels me the value is redundant. I'll suppress it for now.
+        @SuppressWarnings("UnusedAssignment")
+        String languageCode = "en";
+        languageCode = sp.getString(languageKey, "en");
+
+        if(languageCode.length() == 2) {
+            return new Locale(languageCode);
+        }
+        else if(languageCode.contains("_")) {
+            String country = languageCode
+                    .substring(languageCode.indexOf("_"), languageCode.length());
+            return new Locale(languageCode.substring(0, 2), country);
+        }
+        return Locale.getDefault();
+    }
+
+    private boolean checkIfLandscape() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        actionBarHandler.setupMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        return actionBarHandler.onItemSelected(item);
+    }
+
+    public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
+        this.onInvokeCreateOptionsMenuListener = listener;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -3,17 +3,19 @@ package org.schabi.newpipe;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
+import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.SearchView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.support.v7.widget.SearchView;
-import android.widget.ImageView;
+
+import java.util.ArrayList;
+
+import org.schabi.newpipe.services.ServiceList;

 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -37,15 +39,27 @@ public class VideoItemListActivity extends AppCompatActivity
        implements VideoItemListFragment.Callbacks {

    private static final String TAG = VideoItemListFragment.class.toString();
+
+    // arguments to give to this activity
+    public static final String VIDEO_INFO_ITEMS = "video_info_items";
+
+    // savedInstanceBundle arguments
    private static final String QUERY = "query";
    private static final String STREAMING_SERVICE = "streaming_service";

+    // activity modes
+    private static final int SEARCH_MODE = 0;
+    private static final int PRESENT_VIDEOS_MODE = 1;
+
+    private int mode = SEARCH_MODE;
    private int currentStreamingServiceId = -1;
    private String searchQuery = "";

    private VideoItemListFragment listFragment;
+    private VideoItemDetailFragment videoFragment = null;
+    private Menu menu = null;

-    public class SearchVideoQueryListener implements SearchView.OnQueryTextListener {
+    private class SearchVideoQueryListener implements SearchView.OnQueryTextListener {

        @Override
        public boolean onQueryTextSubmit(String query) {
@@ -56,15 +70,20 @@ public class VideoItemListActivity extends AppCompatActivity
                // hide virtual keyboard
                InputMethodManager inputManager =
                        (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                inputManager.hideSoftInputFromWindow(
-                        getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                try {
+                    //noinspection ConstantConditions
+                    inputManager.hideSoftInputFromWindow(
+                            getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                } catch(NullPointerException e) {
+                    Log.e(TAG, "Could not get widget with focus");
+                    e.printStackTrace();
+                }
                // clear focus
                // 1. to not open up the keyboard after switching back to this
                // 2. It's a workaround to a seeming bug by the Android OS it self, causing
                //    onQueryTextSubmit to trigger twice when focus is not cleared.
                // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
                getCurrentFocus().clearFocus();
-                hideWatermark();
            } catch(Exception e) {
                e.printStackTrace();
            }
@@ -78,13 +97,6 @@ public class VideoItemListActivity extends AppCompatActivity

    }

-    private void hideWatermark() {
-        ImageView waterMark = (ImageView) findViewById(R.id.list_view_watermark);
-        if(waterMark != null) {
-            waterMark.setVisibility(View.GONE);
-        }
-    }
-
    /**
     * Whether or not the activity is in two-pane mode, i.e. running on a tablet
     * device.
@@ -96,21 +108,39 @@ public class VideoItemListActivity extends AppCompatActivity
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videoitem_list);

-        listFragment = (VideoItemListFragment)
-                getSupportFragmentManager().findFragmentById(R.id.videoitem_list);
-
-        //-------- remove this line when multiservice support is implemented ----------
+        //------ todo: remove this line when multiservice support is implemented ------
        currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
        //-----------------------------------------------------------------------------
-        VideoItemListFragment listFragment = (VideoItemListFragment) getSupportFragmentManager()
+
+        listFragment = (VideoItemListFragment) getSupportFragmentManager()
                .findFragmentById(R.id.videoitem_list);
        listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));

-        if(savedInstanceState != null) {
+        Bundle arguments = getIntent().getExtras();
+
+        if(arguments != null) {
+            //Parcelable[] p = arguments.getParcelableArray(VIDEO_INFO_ITEMS);
+            ArrayList<VideoPreviewInfo> p = arguments.getParcelableArrayList(VIDEO_INFO_ITEMS);
+            if(p != null) {
+                mode = PRESENT_VIDEOS_MODE;
+                try {
+                    //noinspection ConstantConditions
+                    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+                } catch (NullPointerException e) {
+                    Log.e(TAG, "Could not get SupportActionBar");
+                    e.printStackTrace();
+                }
+
+                listFragment.present(p);
+            }
+        }
+
+
+        if(savedInstanceState != null
+                && mode != PRESENT_VIDEOS_MODE) {
            searchQuery = savedInstanceState.getString(QUERY);
            currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
            if(!searchQuery.isEmpty()) {
-                hideWatermark();
                listFragment.search(searchQuery);
            }
        }
@@ -130,19 +160,18 @@ public class VideoItemListActivity extends AppCompatActivity
                    .setActivateOnItemClick(true);

            SearchView searchView = (SearchView)findViewById(R.id.searchViewTablet);
-            // Somehow the seticonifiedbydefault property set by the layout xml is not working on
-            // the support version on SearchView, so it needs to be set programmatically.
-            searchView.setIconifiedByDefault(false);
-            searchView.setIconified(false);
-            searchView.setOnQueryTextListener(new SearchVideoQueryListener());
-
-            ActionBarHandler.getHandler().setupNavMenu(this);
-
+            if(mode != PRESENT_VIDEOS_MODE) {
+                // Somehow the seticonifiedbydefault property set by the layout xml is not working on
+                // the support version on SearchView, so it needs to be set programmatically.
+                searchView.setIconifiedByDefault(false);
+                searchView.setIconified(false);
+                searchView.setOnQueryTextListener(new SearchVideoQueryListener());
+            } else {
+                searchView.setVisibility(View.GONE);
+            }
        }

        SettingsActivity.initSettings(this);
-
-        // TODO: If exposing deep links into your app, handle intents here.
    }

    /**
@@ -164,10 +193,17 @@ public class VideoItemListActivity extends AppCompatActivity
            arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
            arguments.putString(VideoItemDetailFragment.VIDEO_URL, webpage_url);
            arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
+            videoFragment = new VideoItemDetailFragment();
+            videoFragment.setArguments(arguments);
+            videoFragment.setOnInvokeCreateOptionsMenuListener(new VideoItemDetailFragment.OnInvokeCreateOptionsMenuListener() {
+                @Override
+                public void createOptionsMenu() {
+                    menu.clear();
+                    onCreateOptionsMenu(menu);
+                }
+            });
            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.videoitem_detail_container, fragment)
+                    .replace(R.id.videoitem_detail_container, videoFragment)
                    .commit();
        } else {
            // In single-pane mode, simply start the detail activity
@@ -181,10 +217,12 @@ public class VideoItemListActivity extends AppCompatActivity
    }


-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        if(findViewById(R.id.videoitem_detail_container) == null) {
-            MenuInflater inflater = getMenuInflater();
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        this.menu = menu;
+        MenuInflater inflater = getMenuInflater();
+        if(mode != PRESENT_VIDEOS_MODE &&
+                findViewById(R.id.videoitem_detail_container) == null) {
            inflater.inflate(R.menu.videoitem_list, menu);
            MenuItem searchItem = menu.findItem(R.id.action_search);
            SearchView searchView = (SearchView) searchItem.getActionView();
@@ -192,9 +230,10 @@ public class VideoItemListActivity extends AppCompatActivity
            searchView.setOnQueryTextListener(
                    new SearchVideoQueryListener());

+        } else if (videoFragment != null){
+            videoFragment.onCreateOptionsMenu(menu, inflater);
        } else {
-            MenuInflater inflater = getMenuInflater();
-            ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
+            inflater.inflate(R.menu.videoitem_two_pannel, menu);
        }

        return true;
@@ -203,14 +242,23 @@ public class VideoItemListActivity extends AppCompatActivity
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();
-        if(id == R.id.action_settings) {
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
-            return super.onOptionsItemSelected(item);
+
+        switch(id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, VideoItemListActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return videoFragment.onOptionsItemSelected(item) ||
+                    super.onOptionsItemSelected(item);
        }
-        return true;
    }

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

-import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
 import android.view.View;
@@ -13,8 +15,12 @@ import android.widget.ListView;
 import android.widget.Toast;

 import java.net.URL;
+import java.util.List;
 import java.util.Vector;

+import org.schabi.newpipe.services.SearchEngine;
+import org.schabi.newpipe.services.StreamingService;
+

 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -41,6 +47,11 @@ public class VideoItemListFragment extends ListFragment {
    private StreamingService streamingService = null;
    private VideoListAdapter videoListAdapter;

+    // activity modes
+    private static final int SEARCH_MODE = 0;
+    private static final int PRESENT_VIDEOS_MODE = 1;
+
+    private int mode = SEARCH_MODE;
    private String query = "";
    private int lastPage = 0;

@@ -50,29 +61,30 @@ public class VideoItemListFragment extends ListFragment {
    private LoadThumbsRunnable loadThumbsRunnable = null;
    // used to track down if results posted by threads ar still valid
    private int currentRequestId = -1;
+    private ListView list;

    private class ResultRunnable implements Runnable {
-        private SearchEngine.Result result;
-        private int reuqestId;
+        private final SearchEngine.Result result;
+        private final int requestId;
        public ResultRunnable(SearchEngine.Result result, int requestId) {
            this.result = result;
-            this.reuqestId = requestId;
+            this.requestId = requestId;
        }
        @Override
        public void run() {
-            updateListOnResult(result, reuqestId);
+            updateListOnResult(result, requestId);
        }
    }

    private class SearchRunnable implements Runnable {
-        private Class engineClass = null;
-        private String query;
-        private int page;
-        Handler h = new Handler();
+        private final SearchEngine engine;
+        private final String query;
+        private final int page;
+        final Handler h = new Handler();
        private volatile boolean run = true;
-        private int requestId;
-        public SearchRunnable(Class engineClass, String query, int page, int requestId) {
-            this.engineClass = engineClass;
+        private final int requestId;
+        public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
+            this.engine = engine;
            this.query = query;
            this.page = page;
            this.requestId = requestId;
@@ -82,15 +94,12 @@ public class VideoItemListFragment extends ListFragment {
        }
        @Override
        public void run() {
-            SearchEngine engine = null;
            try {
-                engine = (SearchEngine) engineClass.newInstance();
-            } catch(Exception e) {
-                e.printStackTrace();
-                return;
-            }
-            try {
-                SearchEngine.Result result = engine.search(query, page);
+                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+                String searchLanguageKey = getContext().getString(R.string.searchLanguage);
+                String searchLanguage = sp.getString(searchLanguageKey, "en");
+                SearchEngine.Result result = engine.search(query, page, searchLanguage);
+                Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
                if(run) {
                    h.post(new ResultRunnable(result, requestId));
                }
@@ -107,14 +116,14 @@ public class VideoItemListFragment extends ListFragment {
    }

    private class LoadThumbsRunnable implements Runnable {
-        private Vector<String> thumbnailUrlList = new Vector<>();
-        private Vector<Boolean> downloadedList;
-        Handler h = new Handler();
+        private final Vector<String> thumbnailUrlList = new Vector<>();
+        private final Vector<Boolean> downloadedList;
+        final Handler h = new Handler();
        private volatile boolean run = true;
-        private int requestId;
-        public LoadThumbsRunnable(Vector<VideoInfoItem> videoList,
+        private final int requestId;
+        public LoadThumbsRunnable(Vector<VideoPreviewInfo> videoList,
                                  Vector<Boolean> downloadedList, int requestId) {
-            for(VideoInfoItem item : videoList) {
+            for(VideoPreviewInfo item : videoList) {
                thumbnailUrlList.add(item.thumbnail_url);
            }
            this.downloadedList = downloadedList;
@@ -130,7 +139,7 @@ public class VideoItemListFragment extends ListFragment {
        public void run() {
            for(int i = 0; i < thumbnailUrlList.size() && run; i++) {
                if(!downloadedList.get(i)) {
-                    Bitmap thumbnail = null;
+                    Bitmap thumbnail;
                    try {
                        thumbnail = BitmapFactory.decodeStream(
                                new URL(thumbnailUrlList.get(i)).openConnection().getInputStream());
@@ -144,9 +153,9 @@ public class VideoItemListFragment extends ListFragment {
    }

    private class SetThumbnailRunnable implements Runnable {
-        private int index;
-        private Bitmap thumbnail;
-        private int requestId;
+        private final int index;
+        private final Bitmap thumbnail;
+        private final int requestId;
        public SetThumbnailRunnable(int index, Bitmap thumbnail, int requestId) {
            this.index = index;
            this.thumbnail = thumbnail;
@@ -155,13 +164,22 @@ public class VideoItemListFragment extends ListFragment {
        @Override
        public void run() {
            if(requestId == currentRequestId) {
-                videoListAdapter.updateDownloadedThumbnailList(index, true);
+                videoListAdapter.updateDownloadedThumbnailList(index);
                videoListAdapter.setThumbnail(index, thumbnail);
            }
        }
    }

+    public void present(List<VideoPreviewInfo> videoList) {
+        mode = PRESENT_VIDEOS_MODE;
+        setListShown(true);
+        getListView().smoothScrollToPosition(0);
+
+        updateList(videoList);
+    }
+
    public void search(String query) {
+        mode = SEARCH_MODE;
        this.query = query;
        this.lastPage = 1;
        videoListAdapter.clearVideoList();
@@ -170,7 +188,7 @@ public class VideoItemListFragment extends ListFragment {
        getListView().smoothScrollToPosition(0);
    }

-    public void nextPage() {
+    private void nextPage() {
        lastPage++;
        Log.d(TAG, getString(R.string.searchPage) + Integer.toString(lastPage));
        startSearch(query, lastPage);
@@ -179,7 +197,8 @@ public class VideoItemListFragment extends ListFragment {
    private void startSearch(String query, int page) {
        currentRequestId++;
        terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineClass(), query, page, currentRequestId);
+        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(),
+                                            query, page, currentRequestId);
        searchThread = new Thread(searchRunnable);
        searchThread.start();
    }
@@ -188,7 +207,7 @@ public class VideoItemListFragment extends ListFragment {
        this.streamingService = streamingService;
    }

-    public void updateListOnResult(SearchEngine.Result result, int requestId) {
+    private void updateListOnResult(SearchEngine.Result result, int requestId) {
        if(requestId == currentRequestId) {
            setListShown(true);
            if (result.resultList.isEmpty()) {
@@ -203,7 +222,7 @@ public class VideoItemListFragment extends ListFragment {
        }
    }

-    private void updateList(Vector<VideoInfoItem> list) {
+    private void updateList(List<VideoPreviewInfo> list) {
        try {
            videoListAdapter.addVideoList(list);
            terminateThreads();
@@ -212,13 +231,13 @@ public class VideoItemListFragment extends ListFragment {
            loadThumbsThread = new Thread(loadThumbsRunnable);
            loadThumbsThread.start();
        } catch(java.lang.IllegalStateException e) {
-            Log.w(TAG, "Trying to set value while activity is not existing anymore.");
+            Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
        } catch(Exception e) {
            e.printStackTrace();
        }
    }

-    public void terminateThreads() {
+    private void terminateThreads() {
        if(loadThumbsRunnable != null && loadThumbsRunnable.isRunning()) {
            loadThumbsRunnable.terminate();
            try {
@@ -229,15 +248,11 @@ public class VideoItemListFragment extends ListFragment {
        }
        if(searchThread != null) {
            searchRunnable.terminate();
-            // No need to join, since we don't realy terminate the thread. We just demand
+            // No need to join, since we don't really terminate the thread. We just demand
            // it to post its result runnable into the gui main loop.
        }
    }

-    void displayList() {
-
-    }
-
    /**
     * The serialization (saved instance state) Bundle key representing the
     * activated item position. Only used on tablets.
@@ -261,16 +276,12 @@ public class VideoItemListFragment extends ListFragment {
        void onItemSelected(String id);
    }

-    Callbacks mCallbacks = null;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
+    private Callbacks mCallbacks = null;

    @Override
    public void onViewCreated(View view, Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
+        list = getListView();
        videoListAdapter = new VideoListAdapter(getActivity(), this);
        setListAdapter(videoListAdapter);

@@ -282,8 +293,6 @@ public class VideoItemListFragment extends ListFragment {
        }

        getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
-            private static final float OVERSCROLL_THRESHOLD_IN_PIXELS = 100;
-            private float downY;
            long lastScrollDate = 0;

            @Override
@@ -292,8 +301,8 @@ public class VideoItemListFragment extends ListFragment {

            @Override
            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                ListView list = getListView();
-                if (list.getChildAt(0) != null
+                if (mode != PRESENT_VIDEOS_MODE
+                        && list.getChildAt(0) != null
                        && list.getLastVisiblePosition() == list.getAdapter().getCount() - 1
                        && list.getChildAt(list.getChildCount() - 1).getBottom() <= list.getHeight()) {
                    long time = System.currentTimeMillis();
@@ -308,20 +317,15 @@ public class VideoItemListFragment extends ListFragment {
    }

    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);

        // Activities containing this fragment must implement its callbacks.
-        if (!(activity instanceof Callbacks)) {
+        if (!(context instanceof Callbacks)) {
            throw new IllegalStateException("Activity must implement fragment's callbacks.");
        }

-        mCallbacks = (Callbacks) activity;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
+        mCallbacks = (Callbacks) context;
    }

    @Override
@@ -331,22 +335,11 @@ public class VideoItemListFragment extends ListFragment {
        mCallbacks.onItemSelected(Long.toString(id));
    }

-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        /*
-        if (mActivatedPosition != ListView.INVALID_POSITION) {
-            // Serialize and persist the activated item position.
-            outState.putInt(STATE_ACTIVATED_POSITION, mActivatedPosition);
-        }
-        */
-    }
-
    /**
     * Turns on activate-on-click mode. When this mode is on, list items will be
     * given the 'activated' state when touched.
     */
-    public void setActivateOnItemClick(boolean activateOnItemClick) {
+    public void setActivateOnItemClick(@SuppressWarnings("SameParameterValue") boolean activateOnItemClick) {
        // When setting CHOICE_MODE_SINGLE, ListView will automatically
        // give items the 'activated' state when touched.
        getListView().setChoiceMode(activateOnItemClick
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -2,18 +2,18 @@ package org.schabi.newpipe;

 import android.content.Context;
 import android.graphics.Bitmap;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.TextView;

+import java.util.List;
 import java.util.Vector;

 /**
- * Created by the-scrabi on 11.08.15.
+ * Created by Christian Schabesberger on 11.08.15.
 *
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
 * VideoListAdapter.java is part of NewPipe.
@@ -32,22 +32,22 @@ import java.util.Vector;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-public class VideoListAdapter extends BaseAdapter {
-
-    private static final String TAG = VideoListAdapter.class.toString();
-    private LayoutInflater inflater;
-    private Vector<VideoInfoItem> videoList = new Vector<>();
+class VideoListAdapter extends BaseAdapter {
+    private final Context context;
+    private final VideoInfoItemViewCreator viewCreator;
+    private Vector<VideoPreviewInfo> videoList = new Vector<>();
    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
-    VideoItemListFragment videoListFragment;
-    ListView listView;
+    private final ListView listView;

    public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
-        inflater = LayoutInflater.from(context);
-        this.videoListFragment = videoListFragment;
+        viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
        this.listView = videoListFragment.getListView();
+        this.listView.setDivider(null);
+        this.listView.setDividerHeight(0);
+        this.context = context;
    }

-    public void addVideoList(Vector<VideoInfoItem> videos) {
+    public void addVideoList(List<VideoPreviewInfo> videos) {
        videoList.addAll(videos);
        for(int i = 0; i < videos.size(); i++) {
            downloadedThumbnailList.add(false);
@@ -61,12 +61,12 @@ public class VideoListAdapter extends BaseAdapter {
        notifyDataSetChanged();
    }

-    public Vector<VideoInfoItem> getVideoList() {
+    public Vector<VideoPreviewInfo> getVideoList() {
        return videoList;
    }

-    public void updateDownloadedThumbnailList(int index, boolean val) {
-        downloadedThumbnailList.set(index, val);
+    public void updateDownloadedThumbnailList(int index) {
+        downloadedThumbnailList.set(index, true);
    }

    public Vector<Boolean> getDownloadedThumbnailList() {
@@ -96,40 +96,14 @@ public class VideoListAdapter extends BaseAdapter {

    @Override
    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder;
-        if(convertView == null) {
-            convertView = inflater.inflate(R.layout.video_item, parent, false);
-            holder = new ViewHolder();
-            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
-            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
-            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
-            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        final Context context = parent.getContext();
-        if(videoList.get(position).thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummi_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(videoList.get(position).thumbnail);
-        }
-        holder.itemVideoTitleView.setText(videoList.get(position).title);
-        holder.itemUploaderView.setText(videoList.get(position).uploader);
-        holder.itemDurationView.setText(videoList.get(position).duration);
+        convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));

        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.actionBarColorYoutube));
+            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
        } else {
            convertView.setBackgroundColor(0);
        }

        return convertView;
    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView;
-    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/VideoPreviewInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoPreviewInfo.java
@@ -0,0 +1,79 @@
+package org.schabi.newpipe;
+
+import android.graphics.Bitmap;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.schabi.newpipe.services.AbstractVideoInfo;
+
+/**
+ * Created by Christian Schabesberger on 26.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoPreviewInfo.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/>.
+ */
+
+/**Info object for previews of unopened videos, eg search results, related videos*/
+public class VideoPreviewInfo extends AbstractVideoInfo implements Parcelable {
+    public String duration = "";
+    @SuppressWarnings("WeakerAccess")
+    protected VideoPreviewInfo(Parcel in) {
+        id = in.readString();
+        title = in.readString();
+        uploader = in.readString();
+        duration = in.readString();
+        thumbnail_url = in.readString();
+        thumbnail = (Bitmap) in.readValue(Bitmap.class.getClassLoader());
+        webpage_url = in.readString();
+        upload_date = in.readString();
+        view_count = in.readLong();
+    }
+
+    public VideoPreviewInfo() {
+
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(id);
+        dest.writeString(title);
+        dest.writeString(uploader);
+        dest.writeString(duration);
+        dest.writeString(thumbnail_url);
+        dest.writeValue(thumbnail);
+        dest.writeString(webpage_url);
+        dest.writeString(upload_date);
+        dest.writeLong(view_count);
+    }
+
+    @SuppressWarnings("unused")
+    public static final Parcelable.Creator<VideoPreviewInfo> CREATOR = new Parcelable.Creator<VideoPreviewInfo>() {
+        @Override
+        public VideoPreviewInfo createFromParcel(Parcel in) {
+            return new VideoPreviewInfo(in);
+        }
+
+        @Override
+        public VideoPreviewInfo[] newArray(int size) {
+            return new VideoPreviewInfo[size];
+        }
+    };
+}
--- a/app/src/main/java/org/schabi/newpipe/services/AbstractVideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/services/AbstractVideoInfo.java
@@ -0,0 +1,16 @@
+package org.schabi.newpipe.services;
+
+import android.graphics.Bitmap;
+
+/**Common properties between VideoInfo and VideoPreviewInfo.*/
+public abstract class AbstractVideoInfo {
+    public String id = "";
+    public String title = "";
+    public String uploader = "";
+    //public int duration = -1;
+    public String thumbnail_url = "";
+    public Bitmap thumbnail = null;
+    public String webpage_url = "";
+    public String upload_date = "";
+    public long view_count = -1;
+}
--- a/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
@@ -1,7 +1,8 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.services;

-import android.graphics.Bitmap;
+import org.schabi.newpipe.VideoPreviewInfo;

+import java.util.ArrayList;
 import java.util.Vector;

 /**
@@ -24,14 +25,18 @@ import java.util.Vector;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

+@SuppressWarnings("ALL")
 public interface SearchEngine {


    class Result {
        public String errorMessage = "";
        public String suggestion = "";
-        public Vector<VideoInfoItem> resultList = new Vector<>();
+        public final Vector<VideoPreviewInfo> resultList = new Vector<>();
    }

-    Result search(String query, int page);
+    ArrayList<String> suggestionList(String query);
+
+    //Result search(String query, int page);
+    Result search(String query, int page, String contentCountry);
 }
--- a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
+++ b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
@@ -1,8 +1,8 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.services;

 import android.util.Log;

-import org.schabi.newpipe.youtube.YoutubeService;
+import org.schabi.newpipe.services.youtube.YoutubeService;

 /**
 * Created by Christian Schabesberger on 23.08.15.
@@ -24,6 +24,10 @@ import org.schabi.newpipe.youtube.YoutubeService;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

+/**Provides access to the video streaming services supported by NewPipe.
+ * Currently only Youtube until the API becomes more stable.*/
+
+@SuppressWarnings("ALL")
 public class ServiceList {
    private static final String TAG = ServiceList.class.toString();
    private static final StreamingService[] services = {
@@ -40,7 +44,7 @@ public class ServiceList {
    }
    public static int getIdOfService(String serviceName) {
        for(int i = 0; i < services.length; i++) {
-            if(services[i].getServiceInfo().name == serviceName) {
+            if(services[i].getServiceInfo().name.equals(serviceName)) {
                return i;
            }
        }
--- a/app/src/main/java/org/schabi/newpipe/services/StreamingService.java
+++ b/app/src/main/java/org/schabi/newpipe/services/StreamingService.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.services;

 /**
 * Created by Christian Schabesberger on 23.08.15.
@@ -25,11 +25,11 @@ public interface StreamingService {
        public String name = "";
    }
    ServiceInfo getServiceInfo();
-    Class getExtractorClass();
-    Class getSearchEngineClass();
+    VideoExtractor getExtractorInstance(String url);
+    SearchEngine getSearchEngineInstance();

-    // When a VIEW_ACTION is caught this function will test if the url delivered within the calling
-    // Intent was meant to be watched with this Service.
-    // Return false if this service shall not allow to be callean through ACTIONs.
+    /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
+    Intent was meant to be watched with this Service.
+    Return false if this service shall not allow to be callean through ACTIONs.*/
    boolean acceptUrl(String videoUrl);
 }
--- a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
@@ -0,0 +1,118 @@
+package org.schabi.newpipe.services;
+
+/**
+ * Created by Christian Schabesberger on 10.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoExtractor.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 org.schabi.newpipe.VideoInfo;
+
+/**Scrapes information from a video streaming service (eg, YouTube).*/
+
+@SuppressWarnings("ALL")
+public abstract class VideoExtractor {
+    protected final String pageUrl;
+    protected VideoInfo videoInfo;
+
+    @SuppressWarnings("WeakerAccess")
+    public VideoExtractor(String url) {
+        this.pageUrl = url;
+    }
+
+    /**Fills out the video info fields which are common to all services.
+     * Probably needs to be overridden by subclasses*/
+    public VideoInfo getVideoInfo()
+    {
+        if(videoInfo == null) {
+            videoInfo = new VideoInfo();
+        }
+
+        if(videoInfo.webpage_url.isEmpty()) {
+            videoInfo.webpage_url = pageUrl;
+        }
+
+        if(videoInfo.title.isEmpty()) {
+            videoInfo.title = getTitle();
+        }
+
+        if(videoInfo.duration  < 1) {
+            videoInfo.duration = getLength();
+        }
+
+
+        if(videoInfo.uploader.isEmpty()) {
+            videoInfo.uploader = getUploader();
+        }
+
+        if(videoInfo.description.isEmpty()) {
+            videoInfo.description = getDescription();
+        }
+
+        if(videoInfo.view_count == -1) {
+            videoInfo.view_count = getViews();
+        }
+
+        if(videoInfo.upload_date.isEmpty()) {
+            videoInfo.upload_date = getUploadDate();
+        }
+
+        if(videoInfo.thumbnail_url.isEmpty()) {
+            videoInfo.thumbnail_url = getThumbnailUrl();
+        }
+
+        if(videoInfo.id.isEmpty()) {
+            videoInfo.id = getVideoId(pageUrl);
+        }
+
+        /** Load and extract audio*/
+        if(videoInfo.audioStreams == null) {
+            videoInfo.audioStreams = getAudioStreams();
+        }
+        /** Extract video stream url*/
+        if(videoInfo.videoStreams == null) {
+            videoInfo.videoStreams = getVideoStreams();
+        }
+
+        if(videoInfo.uploader_thumbnail_url.isEmpty()) {
+            videoInfo.uploader_thumbnail_url = getUploaderThumbnailUrl();
+        }
+
+        if(videoInfo.startPosition < 0) {
+            videoInfo.startPosition = getTimeStamp();
+        }
+
+        //Bitmap thumbnail = null;
+        //Bitmap uploader_thumbnail = null;
+        //int videoAvailableStatus = VIDEO_AVAILABLE;
+        return videoInfo;
+    }
+
+    protected abstract String getVideoUrl(String videoId);
+    protected abstract String getVideoId(String siteUrl);
+    protected abstract int getTimeStamp();
+    protected abstract String getTitle();
+    protected abstract String getDescription();
+    protected abstract String getUploader();
+    protected abstract int getLength();
+    protected abstract int getViews();
+    protected abstract String getUploadDate();
+    protected abstract String getThumbnailUrl();
+    protected abstract String getUploaderThumbnailUrl();
+    protected abstract VideoInfo.AudioStream[] getAudioStreams();
+    protected abstract VideoInfo.VideoStream[] getVideoStreams();
+}
--- a/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngine.java
@@ -1,18 +1,28 @@
-package org.schabi.newpipe.youtube;
-
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.SearchEngine;
-import org.schabi.newpipe.VideoInfoItem;
+package org.schabi.newpipe.services.youtube;

 import android.net.Uri;
 import android.util.Log;

-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.services.SearchEngine;
+import org.schabi.newpipe.VideoPreviewInfo;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;

 /**
 * Created by Christian Schabesberger on 09.08.15.
@@ -39,7 +49,8 @@ public class YoutubeSearchEngine implements SearchEngine {
    private static final String TAG = YoutubeSearchEngine.class.toString();

    @Override
-    public Result search(String query, int page) {
+    public Result search(String query, int page, String languageCode) {
+        //String contentCountry = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string., "");
        Uri.Builder builder = new Uri.Builder();
        builder.scheme("https")
                .authority("www.youtube.com")
@@ -47,9 +58,19 @@ public class YoutubeSearchEngine implements SearchEngine {
                .appendQueryParameter("search_query", query)
                .appendQueryParameter("page", Integer.toString(page))
                .appendQueryParameter("filters", "video");
-        String url = builder.build().toString();

-        String site = Downloader.download(url);
+        String site;
+        String url = builder.build().toString();
+        //if we've been passed a valid language code, append it to the URL
+        if(!languageCode.isEmpty()) {
+          //assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
+                site  = Downloader.download(url, languageCode);
+        }
+        else {
+            site = Downloader.download(url);
+        }
+
+
        Document doc = Jsoup.parse(site, url);
        Result result = new Result();
        Element list = doc.select("ol[class=\"item-section\"]").first();
@@ -58,14 +79,14 @@ public class YoutubeSearchEngine implements SearchEngine {
        int i = 0;
        for(Element item : list.children()) {
            i++;
-            /* First we need to determine witch kind of item we are working with.
-               Youtube depicts fife different kinds if items at its search result page. These are
-               regular videos, playlists, channels, two types of video suggestions, and a no video
-               found item. Since we only want videos, we net to filter out all the others.
+            /* First we need to determine which kind of item we are working with.
+               Youtube depicts five different kinds of items on its search result page. These are
+               regular videos, playlists, channels, two types of video suggestions, and a "no video
+               found" item. Since we only want videos, we need to filter out all the others.
               An example for this can be seen here:
               https://www.youtube.com/results?search_query=asdf&page=1

-               We already applied a filter to the url, so we don't need to care about channels, and
+               We already applied a filter to the url, so we don't need to care about channels and
               playlists now.
            */

@@ -74,44 +95,96 @@ public class YoutubeSearchEngine implements SearchEngine {
            // both types of spell correction item
            if(!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
                result.suggestion = el.select("a").first().text();
-                // search message item
+            // search message item
            } else if(!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
                result.errorMessage = el.text();

-                // video item type
+            // video item type
            } else if(!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
-                VideoInfoItem resultItem = new VideoInfoItem();
+                VideoPreviewInfo resultItem = new VideoPreviewInfo();
                Element dl = el.select("h3").first().select("a").first();
                resultItem.webpage_url = dl.attr("abs:href");
                try {
                    Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
                    Matcher m = p.matcher(resultItem.webpage_url);
-                    m.find();
                    resultItem.id=m.group(1);
                } catch (Exception e) {
                    e.printStackTrace();
                }
                resultItem.title = dl.text();
-                resultItem.duration = item.select("span[class=\"video-time\"]").first()
-                        .text();
+
+                resultItem.duration = item.select("span[class=\"video-time\"]").first().text();
+
                resultItem.uploader = item.select("div[class=\"yt-lockup-byline\"]").first()
                        .select("a").first()
                        .text();
+                resultItem.upload_date = item.select("div[class=\"yt-lockup-meta\"]").first()
+                        .select("li").first()
+                        .text();
                Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
                        .select("img").first();
                resultItem.thumbnail_url = te.attr("abs:src");
-                // Sometimes youtube sends links to gif files witch somehow seam to not exist
+                // Sometimes youtube sends links to gif files which somehow seem to not exist
                // anymore. Items with such gif also offer a secondary image source. So we are going
-                // to use that if we caught such an item.
+                // to use that if we've caught such an item.
                if(resultItem.thumbnail_url.contains(".gif")) {
                    resultItem.thumbnail_url = te.attr("abs:data-thumb");
                }
                result.resultList.add(resultItem);
            } else {
-                Log.e(TAG, "GREAT FUCKING ERROR");
+                //noinspection ConstantConditions
+                Log.e(TAG, "unexpected element found:\""+el+"\"");
            }
        }
-
        return result;
    }
+
+    @Override
+    public ArrayList<String> suggestionList(String query) {
+
+        ArrayList<String> suggestions = new ArrayList<>();
+
+        Uri.Builder builder = new Uri.Builder();
+        builder.scheme("https")
+                .authority("suggestqueries.google.com")
+                .appendPath("complete")
+                .appendPath("search")
+                .appendQueryParameter("client", "")
+                .appendQueryParameter("output", "toolbar")
+                .appendQueryParameter("ds", "yt")
+                .appendQueryParameter("q", query);
+        String url = builder.build().toString();
+
+        String response = Downloader.download(url);
+
+        //TODO: Parse xml data using Jsoup not done
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder;
+        org.w3c.dom.Document doc = null;
+
+        try {
+            dBuilder = dbFactory.newDocumentBuilder();
+            doc = dBuilder.parse(new InputSource(new ByteArrayInputStream(response.getBytes("utf-8"))));
+            doc.getDocumentElement().normalize();
+        }catch (ParserConfigurationException | SAXException | IOException e) {
+            e.printStackTrace();
+        }
+
+        if(doc!=null){
+            NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
+            for (int temp = 0; temp < nList.getLength(); temp++) {
+
+                NodeList nList1 = doc.getElementsByTagName("suggestion");
+                Node nNode1 = nList1.item(temp);
+                if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
+                    suggestions.add(eElement.getAttribute("data"));
+                }
+            }
+        }else {
+            Log.e(TAG, "GREAT FUCKING ERROR");
+        }
+        return suggestions;
+    }
+
 }
--- a/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeService.java
@@ -1,6 +1,9 @@
-package org.schabi.newpipe.youtube;
+package org.schabi.newpipe.services.youtube;
+
+import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.services.VideoExtractor;
+import org.schabi.newpipe.services.SearchEngine;

-import org.schabi.newpipe.StreamingService;

 /**
 * Created by Christian Schabesberger on 23.08.15.
@@ -30,19 +33,21 @@ public class YoutubeService implements StreamingService {
        return serviceInfo;
    }
    @Override
-    public Class getExtractorClass() {
-        return YoutubeExtractor.class;
+    public VideoExtractor getExtractorInstance(String url) {
+        if(acceptUrl(url)) {
+            return new YoutubeVideoExtractor(url);
+        }
+        else {
+            throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
+        }
    }
    @Override
-    public Class getSearchEngineClass() {
-        return YoutubeSearchEngine.class;
+    public SearchEngine getSearchEngineInstance() {
+        return new YoutubeSearchEngine();
    }
    @Override
    public boolean acceptUrl(String videoUrl) {
-        if(videoUrl.contains("youtube")) {
-            return true;
-        } else {
-            return false;
-        }
+        return videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be");
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java
@@ -0,0 +1,610 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.util.Log;
+import android.util.Xml;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.parser.Parser;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.ScriptableObject;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.services.VideoExtractor;
+import org.schabi.newpipe.MediaFormat;
+import org.schabi.newpipe.VideoInfo;
+import org.schabi.newpipe.VideoPreviewInfo;
+import org.xmlpull.v1.XmlPullParser;
+
+import java.io.StringReader;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Christian Schabesberger on 06.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractor.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 YoutubeVideoExtractor extends VideoExtractor {
+
+    private static final String TAG = YoutubeVideoExtractor.class.toString();
+    private final Document doc;
+    private JSONObject jsonObj;
+    private JSONObject playerArgs;
+
+    // static values
+    private static final String DECRYPTION_FUNC_NAME="decrypt";
+
+    // cached values
+    private static volatile String decryptionCode = "";
+
+
+    public YoutubeVideoExtractor(String pageUrl) {
+        super(pageUrl);//most common videoInfo fields are now set in our superclass, for all services
+        String pageContents = Downloader.download(cleanUrl(pageUrl));
+        doc = Jsoup.parse(pageContents, pageUrl);
+
+        //attempt to load the youtube js player JSON arguments
+        try {
+            String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContents);
+            jsonObj = new JSONObject(jsonString);
+            playerArgs = jsonObj.getJSONObject("args");
+
+        } catch (Exception e) {//if this fails, the video is most likely not available.
+            // Determining why is done later.
+            videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
+            Log.d(TAG, "Could not load JSON data for Youtube video \""+pageUrl+"\". This most likely means the video is unavailable");
+        }
+
+        //----------------------------------
+        // load and parse description code, if it isn't already initialised
+        //----------------------------------
+        if (decryptionCode.isEmpty()) {
+            try {
+            // The Youtube service needs to be initialized by downloading the
+            // js-Youtube-player. This is done in order to get the algorithm
+            // for decrypting cryptic signatures inside certain stream urls.
+                JSONObject ytAssets = jsonObj.getJSONObject("assets");
+                String playerUrl = ytAssets.getString("js");
+
+                if (playerUrl.startsWith("//")) {
+                    playerUrl = "https:" + playerUrl;
+                }
+                decryptionCode = loadDecryptionCode(playerUrl);
+            } catch (Exception e){
+                Log.d(TAG, "Could not load decryption code for the Youtube service.");
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public String getTitle() {
+        try {//json player args method
+            return playerArgs.getString("title");
+        } catch(JSONException je) {//html <meta> method
+            je.printStackTrace();
+            Log.w(TAG, "failed to load title from JSON args; trying to extract it from HTML");
+        } try { // fall through to fall-back
+            return doc.select("meta[name=title]").attr("content");
+        } catch (Exception e) {
+            Log.e(TAG, "failed permanently to load title.");
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    @Override
+    public String getDescription() {
+        try {
+            return doc.select("p[id=\"eow-description\"]").first().html();
+        } catch (Exception e) {//todo: add fallback method
+            Log.e(TAG, "failed to load description.");
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    @Override
+    public String getUploader() {
+        try {//json player args method
+            return playerArgs.getString("author");
+        } catch(JSONException je) {
+            je.printStackTrace();
+            Log.w(TAG, "failed to load uploader name from JSON args; trying to extract it from HTML");
+        } try {//fall through to fallback HTML method
+            return doc.select("div.yt-user-info").first().text();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e(TAG, "failed permanently to load uploader name.");
+            return "";
+        }
+    }
+
+    @Override
+    public int getLength() {
+        try {
+            return playerArgs.getInt("length_seconds");
+        } catch (JSONException je) {//todo: find fallback method
+            Log.e(TAG, "failed to load video duration from JSON args");
+            je.printStackTrace();
+            return -1;
+        }
+    }
+
+    @Override
+    public int getViews() {
+        try {
+            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr("content");
+            return Integer.parseInt(viewCountString);
+        } catch (Exception e) {//todo: find fallback method
+            Log.e(TAG, "failed to number of views");
+            e.printStackTrace();
+            return -1;
+        }
+    }
+
+    @Override
+    public String getUploadDate() {
+        try {
+            return doc.select("meta[itemprop=datePublished]").attr("content");
+        } catch (Exception e) {//todo: add fallback method
+            Log.e(TAG, "failed to get upload date.");
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    @Override
+    public String getThumbnailUrl() {
+        //first attempt getting a small image version
+        //in the html extracting part we try to get a thumbnail with a higher resolution
+        // Try to get high resolution thumbnail if it fails use low res from the player instead
+        try {
+            return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
+        } catch(Exception e) {
+            Log.w(TAG, "Could not find high res Thumbnail. Using low res instead");
+            //fall through to fallback
+        } try {
+            return playerArgs.getString("thumbnail_url");
+        } catch (JSONException je) {
+            je.printStackTrace();
+            Log.w(TAG, "failed to extract thumbnail URL from JSON args; trying to extract it from HTML");
+            return "";
+        }
+    }
+
+    @Override
+    public String getUploaderThumbnailUrl() {
+        try {
+            return doc.select("a[class*=\"yt-user-photo\"]").first()
+                    .select("img").first()
+                    .attr("abs:data-thumb");
+        } catch (Exception e) {//todo: add fallback method
+            Log.e(TAG, "failed to get uploader thumbnail URL.");
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    @Override
+    public VideoInfo.AudioStream[] getAudioStreams() {
+        try {
+            String dashManifest = playerArgs.getString("dashmpd");
+            return parseDashManifest(dashManifest, decryptionCode);
+
+        } catch (NullPointerException e) {
+            Log.e(TAG, "Could not find \"dashmpd\" upon the player args (maybe no dash manifest available).");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new VideoInfo.AudioStream[0];
+    }
+
+    @Override
+    public VideoInfo.VideoStream[] getVideoStreams() {
+        try{
+            //------------------------------------
+            // extract video stream url
+            //------------------------------------
+            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
+            Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
+            for(String url_data_str : encoded_url_map.split(",")) {
+                Map<String, String> tags = new HashMap<>();
+                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
+                    String[] split_tag = raw_tag.split("=");
+                    tags.put(split_tag[0], split_tag[1]);
+                }
+
+                int itag = Integer.parseInt(tags.get("itag"));
+                String streamUrl = URLDecoder.decode(tags.get("url"), "UTF-8");
+
+                // if video has a signature: decrypt it and add it to the url
+                if(tags.get("s") != null) {
+                    streamUrl = streamUrl + "&signature=" + decryptSignature(tags.get("s"), decryptionCode);
+                }
+
+                if(resolveFormat(itag) != -1) {
+                    videoStreams.add(new VideoInfo.VideoStream(
+                            streamUrl,
+                            resolveFormat(itag),
+                            resolveResolutionString(itag)));
+                }
+            }
+            return videoStreams.toArray(new VideoInfo.VideoStream[videoStreams.size()]);
+
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to get video stream");
+            e.printStackTrace();
+            return new VideoInfo.VideoStream[0];
+        }
+    }
+
+    /**These lists only contain itag formats that are supported by the common Android Video player.
+    However if you are looking for a list showing all itag formats, look at
+    https://github.com/rg3/youtube-dl/issues/1687 */
+
+    @SuppressWarnings("WeakerAccess")
+    public static int resolveFormat(int itag) {
+        switch(itag) {
+            // video
+            case 17: return MediaFormat.v3GPP.id;
+            case 18: return MediaFormat.MPEG_4.id;
+            case 22: return MediaFormat.MPEG_4.id;
+            case 36: return MediaFormat.v3GPP.id;
+            case 37: return MediaFormat.MPEG_4.id;
+            case 38: return MediaFormat.MPEG_4.id;
+            case 43: return MediaFormat.WEBM.id;
+            case 44: return MediaFormat.WEBM.id;
+            case 45: return MediaFormat.WEBM.id;
+            case 46: return MediaFormat.WEBM.id;
+            default:
+                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
+                return -1;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public static String resolveResolutionString(int itag) {
+        switch(itag) {
+            case 17: return "144p";
+            case 18: return "360p";
+            case 22: return "720p";
+            case 36: return "240p";
+            case 37: return "1080p";
+            case 38: return "1080p";
+            case 43: return "360p";
+            case 44: return "480p";
+            case 45: return "720p";
+            case 46: return "1080p";
+            default:
+                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
+                return null;
+        }
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getVideoId(String url) {
+        String id;
+        String pat;
+
+        if(url.contains("youtube")) {
+            pat = "youtube\\.com/watch\\?v=([\\-a-zA-Z0-9_]{11})";
+        }
+        else if(url.contains("youtu.be")) {
+            pat = "youtu\\.be/([a-zA-Z0-9_-]{11})";
+        }
+        else {
+            Log.e(TAG, "Error could not parse url: " + url);
+            return "";
+        }
+        id = matchGroup1(pat, url);
+        if(!id.isEmpty()){
+            Log.i(TAG, "string \""+url+"\" matches!");
+            return id;
+        }
+        Log.i(TAG, "string \""+url+"\" does not match.");
+        return "";
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getVideoUrl(String videoId) {
+        return "https://www.youtube.com/watch?v=" + videoId;
+    }
+
+    /**Attempts to parse (and return) the offset to start playing the video from.
+     * @return the offset (in seconds), or 0 if no timestamp is found.*/
+    @Override
+    public int getTimeStamp(){
+        String timeStamp = matchGroup1("((#|&)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)", pageUrl);
+
+        //TODO: test this
+        if(!timeStamp.isEmpty()) {
+            String secondsString = matchGroup1("(\\d{1,3})s", timeStamp);
+            String minutesString = matchGroup1("(\\d{1,3})m", timeStamp);
+            String hoursString = matchGroup1("(\\d{1,3})h", timeStamp);
+
+            if(secondsString.isEmpty()//if nothing was got,
+            && minutesString.isEmpty()//treat as unlabelled seconds
+            && hoursString.isEmpty())
+                secondsString = matchGroup1("t=(\\d{1,3})", timeStamp);
+
+            int seconds = (secondsString.isEmpty() ? 0 : Integer.parseInt(secondsString));
+            int minutes = (minutesString.isEmpty() ? 0 : Integer.parseInt(minutesString));
+            int hours =   (hoursString.isEmpty()   ? 0 : Integer.parseInt(hoursString));
+
+            int ret = seconds + (60*minutes) + (3600*hours);//don't trust BODMAS!
+            Log.d(TAG, "derived timestamp value:"+ret);
+            return ret;
+            //the ordering varies internationally
+        }//else, return default 0
+        return 0;
+    }
+
+    @Override
+    public VideoInfo getVideoInfo() {
+        videoInfo = super.getVideoInfo();
+        //todo: replace this with a call to getVideoId, if possible
+        videoInfo.id = matchGroup1("v=([0-9a-zA-Z_-]{11})", pageUrl);
+
+        videoInfo.age_limit = 0;
+
+        //average rating
+        try {
+            videoInfo.average_rating = playerArgs.getString("avg_rating");
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        //---------------------------------------
+        // extracting information from html page
+        //---------------------------------------
+
+        // Determine what went wrong when the Video is not available
+        if(videoInfo.videoAvailableStatus == VideoInfo.VIDEO_UNAVAILABLE) {
+            if(doc.select("h1[id=\"unavailable-message\"]").first().text().contains("GEMA")) {
+                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE_GEMA;
+            }
+        }
+
+        String likesString = "";
+        String dislikesString = "";
+        try {
+            // likes
+            likesString = doc.select("button.like-button-renderer-like-button").first()
+                    .select("span.yt-uix-button-content").first().text();
+            videoInfo.like_count = Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
+            // dislikes
+            dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
+                            .select("span.yt-uix-button-content").first().text();
+
+            videoInfo.dislike_count = Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
+        } catch(NumberFormatException nfe) {
+            Log.e(TAG, "failed to parse likesString \""+likesString+"\" and dislikesString \""+
+            dislikesString+"\" as integers");
+        } catch(Exception e) {
+            // if it fails we know that the video does not offer dislikes.
+            e.printStackTrace();
+            videoInfo.like_count = 0;
+            videoInfo.dislike_count = 0;
+        }
+
+        // next video
+        videoInfo.nextVideo = extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
+                .select("li").first());
+
+        // related videos
+        Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
+        for(Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
+            // first check if we have a playlist. If so leave them out
+            if(li.select("a[class*=\"content-link\"]").first() != null) {
+                relatedVideos.add(extractVideoPreviewInfo(li));
+            }
+        }
+        //todo: replace conversion
+        videoInfo.relatedVideos = relatedVideos;
+        //videoInfo.relatedVideos = relatedVideos.toArray(new VideoPreviewInfo[relatedVideos.size()]);
+        return videoInfo;
+    }
+
+
+    private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
+        if(!dashManifest.contains("/signature/")) {
+            String encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
+            String decryptedSig;
+
+            decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
+            dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
+        }
+        String dashDoc = Downloader.download(dashManifest);
+        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+        try {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setInput(new StringReader(dashDoc));
+            int eventType = parser.getEventType();
+            String tagName = "";
+            String currentMimeType = "";
+            int currentBandwidth = -1;
+            int currentSamplingRate = -1;
+            boolean currentTagIsBaseUrl = false;
+            while(eventType != XmlPullParser.END_DOCUMENT) {
+                switch(eventType) {
+                    case XmlPullParser.START_TAG:
+                        tagName = parser.getName();
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
+                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
+                            currentBandwidth = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
+                            currentSamplingRate = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = true;
+                        }
+
+                        break;
+                    case XmlPullParser.TEXT:
+                        if(currentTagIsBaseUrl &&
+                                (currentMimeType.contains("audio"))) {
+                            int format = -1;
+                            if(currentMimeType.equals(MediaFormat.WEBMA.mimeType)) {
+                                format = MediaFormat.WEBMA.id;
+                            } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
+                                format = MediaFormat.M4A.id;
+                            }
+                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
+                                    format, currentBandwidth, currentSamplingRate));
+                        }
+                    case XmlPullParser.END_TAG:
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = "";
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = false;
+                        }
+                        break;
+                    default:
+                }
+                eventType = parser.next();
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        return audioStreams.toArray(new VideoInfo.AudioStream[audioStreams.size()]);
+    }
+    /**Provides information about links to other videos on the video page, such as related videos.
+     * This is encapsulated in a VideoPreviewInfo object,
+     * which is a subset of the fields in a full VideoInfo.*/
+    private VideoPreviewInfo extractVideoPreviewInfo(Element li) {
+        VideoPreviewInfo info = new VideoPreviewInfo();
+        info.webpage_url = li.select("a.content-link").first()
+                .attr("abs:href");
+        try {
+            info.id = matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //todo: check NullPointerException causing
+        info.title = li.select("span.title").first().text();
+        //this page causes the NullPointerException, after finding it by searching for "tjvg":
+        //https://www.youtube.com/watch?v=Uqg0aEhLFAg
+        String views = li.select("span.view-count").first().text();
+        Log.i(TAG, "title:"+info.title);
+        Log.i(TAG, "view count:"+views);
+        try {
+            info.view_count = Long.parseLong(li.select("span.view-count")
+                    .first().text().replaceAll("[^\\d]", ""));
+        } catch (NullPointerException e) {//related videos sometimes have no view count
+            info.view_count = 0;
+        }
+        info.uploader = li.select("span.g-hovercard").first().text();
+
+        info.duration = li.select("span.video-time").first().text();
+
+        Element img = li.select("img").first();
+        info.thumbnail_url = img.attr("abs:src");
+        // Sometimes youtube sends links to gif files which somehow seem to not exist
+        // anymore. Items with such gif also offer a secondary image source. So we are going
+        // to use that if we caught such an item.
+        if(info.thumbnail_url.contains(".gif")) {
+            info.thumbnail_url = img.attr("data-thumb");
+        }
+        if(info.thumbnail_url.startsWith("//")) {
+            info.thumbnail_url = "https:" + info.thumbnail_url;
+        }
+        return info;
+    }
+
+    private String loadDecryptionCode(String playerUrl) {
+        String playerCode = Downloader.download(playerUrl);
+        String decryptionFuncName = "";
+        String decryptionFunc = "";
+        String helperObjectName;
+        String helperObject = "";
+        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
+        String decryptionCode;
+
+        try {
+            decryptionFuncName = matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
+
+            String functionPattern = "(var "+  decryptionFuncName.replace("$", "\\$") +"=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
+            decryptionFunc = matchGroup1(functionPattern, playerCode);
+            decryptionFunc += ";";
+
+            helperObjectName = matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
+
+            String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)";
+            helperObject = matchGroup1(helperPattern, playerCode);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        callerFunc = callerFunc.replace("%%", decryptionFuncName);
+        decryptionCode = helperObject + decryptionFunc + callerFunc;
+
+        return decryptionCode;
+    }
+
+    private String decryptSignature(String encryptedSig, String decryptionCode) {
+        Context context = Context.enter();
+        context.setOptimizationLevel(-1);
+        Object result = null;
+        try {
+            ScriptableObject scope = context.initStandardObjects();
+            context.evaluateString(scope, decryptionCode, "decryptionCode", 1, null);
+            Function decryptionFunc = (Function) scope.get("decrypt", scope);
+            result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Context.exit();
+        if(result != null)
+            return result.toString();
+        else
+            return "";
+    }
+
+    private String cleanUrl(String complexUrl) {
+        return getVideoUrl(getVideoId(complexUrl));
+    }
+
+    private String matchGroup1(String pattern, String input) {
+        Pattern pat = Pattern.compile(pattern);
+        Matcher mat = pat.matcher(input);
+        boolean foundMatch = mat.find();
+        if (foundMatch) {
+            return mat.group(1);
+        }
+        else {
+            Log.w(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
+            new Exception("failed to find pattern \""+pattern+"\"").printStackTrace();
+            return "";
+        }
+
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -1,399 +0,0 @@
-package org.schabi.newpipe.youtube;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.Extractor;
-import org.schabi.newpipe.VideoInfo;
-
-import android.util.Log;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import org.json.JSONObject;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.parser.Parser;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.VideoInfoItem;
-
-/**
- * Created by Christian Schabesberger on 06.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeExtractor.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 YoutubeExtractor implements Extractor {
-
-
-
-    private static final String TAG = YoutubeExtractor.class.toString();
-
-    // These lists only contain itag formats that are supported by the common Android Video player.
-    // How ever if you are heading for a list showing all itag formats lock at
-    // https://github.com/rg3/youtube-dl/issues/1687
-
-    public static String resolveFormat(int itag) {
-        switch(itag) {
-            case 17: return VideoInfo.F_3GPP;
-            case 18: return VideoInfo.F_MPEG_4;
-            case 22: return VideoInfo.F_MPEG_4;
-            case 36: return VideoInfo.F_3GPP;
-            case 37: return VideoInfo.F_MPEG_4;
-            case 38: return VideoInfo.F_MPEG_4;
-            case 43: return VideoInfo.F_WEBM;
-            case 44: return VideoInfo.F_WEBM;
-            case 45: return VideoInfo.F_WEBM;
-            case 46: return VideoInfo.F_WEBM;
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
-        }
-    }
-
-    public static String resolveResolutionString(int itag) {
-        switch(itag) {
-            case 17: return "144p";
-            case 18: return "360p";
-            case 22: return "720p";
-            case 36: return "240p";
-            case 37: return "1080p";
-            case 38: return "1080p";
-            case 43: return "360p";
-            case 44: return "480p";
-            case 45: return "720p";
-            case 46: return "1080p";
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
-        }
-    }
-
-    private String decryptoinCode = "";
-    private static final String DECRYPTION_FUNC_NAME="decrypt";
-
-    @Override
-    public String getVideoId(String videoUrl) {
-        try {
-            String query = (new URI(videoUrl)).getQuery();
-            String queryElements[] = query.split("&");
-            Map<String, String> queryArguments = new HashMap<>();
-            for(String e : queryElements) {
-                String[] s = e.split("=");
-                queryArguments.put(s[0], s[1]);
-            }
-            return queryArguments.get("v");
-        } catch(Exception e) {
-            Log.e(TAG, "Error could not parse url: " + videoUrl);
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getVideoUrl(String videoId) {
-        return "https://www.youtube.com/watch?v=" + videoId;
-    }
-
-    @Override
-    public VideoInfo getVideoInfo(String siteUrl) {
-        String site = Downloader.download(siteUrl);
-        VideoInfo videoInfo = new VideoInfo();
-
-        Document doc = Jsoup.parse(site, siteUrl);
-
-        try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z]*)");
-            Matcher m = p.matcher(siteUrl);
-            m.find();
-            videoInfo.id = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        videoInfo.age_limit = 0;
-        videoInfo.webpage_url = siteUrl;
-
-        //-------------------------------------
-        // extracting form player args
-        //-------------------------------------
-        JSONObject playerArgs = null;
-        JSONObject ytAssets = null;
-        {
-            Pattern p = Pattern.compile("ytplayer.config\\s*=\\s*(\\{.*?\\});");
-            Matcher m = p.matcher(site);
-            m.find();
-
-            try {
-                playerArgs = (new JSONObject(m.group(1)))
-                        .getJSONObject("args");
-                ytAssets = (new JSONObject(m.group(1)))
-                        .getJSONObject("assets");
-            }catch (Exception e) {
-                e.printStackTrace();
-                // If we fail in this part the video is most likely not available.
-                // Determining why is done later.
-                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
-            }
-        }
-
-        try {
-            videoInfo.uploader = playerArgs.getString("author");
-            videoInfo.title = playerArgs.getString("title");
-            //first attempt gating a small image version
-            //in the html extracting part we try to get a thumbnail with a higher resolution
-            videoInfo.thumbnail_url = playerArgs.getString("thumbnail_url");
-            videoInfo.duration = playerArgs.getInt("length_seconds");
-            videoInfo.average_rating = playerArgs.getString("avg_rating");
-            // View Count will be extracted from html
-            //videoInfo.view_count = playerArgs.getString("view_count");
-
-            //------------------------------------
-            // extract stream url
-            //------------------------------------
-            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.Stream> streams = new Vector<>();
-            for(String url_data_str : encoded_url_map.split(",")) {
-                Map<String, String> tags = new HashMap<>();
-                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
-                    String[] split_tag = raw_tag.split("=");
-                    tags.put(split_tag[0], split_tag[1]);
-                }
-
-                int itag = Integer.parseInt(tags.get("itag"));
-                String streamUrl = terrible_unescape_workaround_fuck(tags.get("url"));
-
-                // if video has a signature decrypt it and add it to the url
-                if(tags.get("s") != null) {
-                    String playerUrl = ytAssets.getString("js");
-                    if(playerUrl.startsWith("//")) {
-                        playerUrl = "https:" + playerUrl;
-                    }
-                    if(decryptoinCode.isEmpty()) {
-                        decryptoinCode = loadDecryptioinCode(playerUrl);
-                    }
-                    streamUrl = streamUrl + "&signature=" + decriptSignature(tags.get("s"), decryptoinCode);
-                }
-
-                if(resolveFormat(itag) != null) {
-                    streams.add(new VideoInfo.Stream(
-                            streamUrl,   //sometimes i have no idea what im programming -.-
-                            resolveFormat(itag),
-                            resolveResolutionString(itag)));
-                }
-            }
-            videoInfo.streams = new VideoInfo.Stream[streams.size()];
-            for(int i = 0; i < streams.size(); i++) {
-                videoInfo.streams[i] = streams.get(i);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //-------------------------------
-        // extrating from html page
-        //-------------------------------
-
-
-        // Determine what went wrong when the Video is not available
-        if(videoInfo.videoAvailableStatus == VideoInfo.VIDEO_UNAVAILABLE) {
-            if(doc.select("h1[id=\"unavailable-message\"]").first().text().contains("GEMA")) {
-                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE_GEMA;
-            }
-        }
-
-        // Try to get high resolution thumbnail if it fails use low res from the player instead
-        try {
-            videoInfo.thumbnail_url = doc.select("link[itemprop=\"thumbnailUrl\"]").first()
-                    .attr("abs:href");
-        } catch(Exception e) {
-            Log.i(TAG, "Could not find high res Thumbnail. Use low res instead");
-        }
-
-        // upload date
-        videoInfo.upload_date = doc.select("strong[class=\"watch-time-text\"").first()
-                .text();
-        // Try to only use date not the text around it
-        try {
-            Pattern p = Pattern.compile("([0-9.]*$)");
-            Matcher m = p.matcher(videoInfo.upload_date);
-            m.find();
-            videoInfo.upload_date = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // description
-        videoInfo.description = doc.select("p[id=\"eow-description\"]").first()
-                .html();
-
-        try {
-            // likes
-            videoInfo.like_count = doc.select("span[class=\"like-button-renderer \"]").first()
-                    .getAllElements().select("button")
-                    .select("span").get(0).text();
-
-
-            // dislikes
-            videoInfo.dislike_count = doc.select("span[class=\"like-button-renderer \"]").first()
-                    .getAllElements().select("button")
-                    .select("span").get(2).text();
-        } catch(Exception e) {
-            // if it fails we know that the video does not offer dislikes.
-            videoInfo.like_count = "0";
-            videoInfo.dislike_count = "0";
-        }
-
-        // uploader thumbnail
-        videoInfo.uploader_thumbnail_url = doc.select("a[class*=\"yt-user-photo\"]").first()
-                .select("img").first()
-                .attr("abs:data-thumb");
-
-        // view count
-        videoInfo.view_count = doc.select("div[class=\"watch-view-count\"]").first().text();
-
-        /* todo finish this code
-
-        // next video
-        videoInfo.nextVideo = extractVideoInfoItem(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                .select("li").first());
-
-        int i = 0;
-        // related videos
-        for(Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
-            // first check if we have a playlist. If so leave them out
-            if(li.select("a[class*=\"content-link\"]").first() != null) {
-                //videoInfo.relatedVideos.add(extractVideoInfoItem(li));
-                //i++;
-                //Log.d(TAG, Integer.toString(i));
-            }
-        }
-
-        */
-
-        return videoInfo;
-    }
-
-    private VideoInfoItem extractVideoInfoItem(Element li) {
-        VideoInfoItem info = new VideoInfoItem();
-        info.webpage_url = li.select("a[class*=\"content-link\"]").first()
-                .attr("abs:href");
-        try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
-            Matcher m = p.matcher(info.webpage_url);
-            m.find();
-            info.id=m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        info.title = li.select("span[class=\"title\"]").first()
-                .text();
-
-        info.uploader = li.select("span[class=\"g-hovercard\"]").first().text();
-
-        info.duration = li.select("span[class=\"video-time\"]").first().text();
-
-        Element img = li.select("img").first();
-        info.thumbnail_url = img.attr("abs:src");
-        // Sometimes youtube sends links to gif files witch somehow seam to not exist
-        // anymore. Items with such gif also offer a secondary image source. So we are going
-        // to use that if we caught such an item.
-        if(info.thumbnail_url.contains(".gif")) {
-            info.thumbnail_url = img.attr("data-thumb");
-        }
-
-        return info;
-    }
-
-    private String terrible_unescape_workaround_fuck(String shit) {
-        String[] splitAtEscape = shit.split("%");
-        String retval = "";
-        retval += splitAtEscape[0];
-        for(int i = 1; i < splitAtEscape.length; i++) {
-            String escNum = splitAtEscape[i].substring(0, 2);
-            char c = (char) Integer.parseInt(escNum,16);
-            retval += c;
-            retval += splitAtEscape[i].substring(2);
-        }
-        return retval;
-    }
-
-    private String loadDecryptioinCode(String playerUrl) {
-        String playerCode = Downloader.download(playerUrl);
-        String decryptionFuncName = "";
-        String decryptionFunc = "";
-        String helperObjectName;
-        String helperObject = "";
-        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
-        String decryptionCode;
-
-        try {
-            Pattern p = Pattern.compile("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(");
-            Matcher m = p.matcher(playerCode);
-            m.find();
-            decryptionFuncName = m.group(1);
-
-            String functionPattern = "(function " + decryptionFuncName.replace("$", "\\$") + "\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            p = Pattern.compile(functionPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            decryptionFunc = m.group(1);
-
-            p = Pattern.compile(";([A-Za-z0-9_\\$]{2})\\...\\(");
-            m = p.matcher(decryptionFunc);
-            m.find();
-            helperObjectName = m.group(1);
-
-            String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)function";
-            p = Pattern.compile(helperPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            helperObject = m.group(1);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        callerFunc = callerFunc.replace("%%", decryptionFuncName);
-        decryptionCode = helperObject + decryptionFunc + callerFunc;
-
-        return decryptionCode;
-    }
-
-    private String decriptSignature(String encryptedSig, String decryptoinCode) {
-        Context context = Context.enter();
-        context.setOptimizationLevel(-1);
-        Object result = null;
-        try {
-            ScriptableObject scope = context.initStandardObjects();
-            context.evaluateString(scope, decryptoinCode, "decryptionCode", 1, null);
-            Function decryptionFunc = (Function) scope.get("decrypt", scope);
-            result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Context.exit();
-        return result.toString();
-    }
-}
--- a/app/src/main/res/drawable-nodpi/buddy.png
+++ b/app/src/main/res/drawable-nodpi/buddy.png
--- a/app/src/main/res/drawable-nodpi/dummy_thumbnail.png
+++ b/app/src/main/res/drawable-nodpi/dummy_thumbnail.png
--- a/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
+++ b/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
--- a/app/src/main/res/drawable-nodpi/gruese_die_gema_unangebracht.png
+++ b/app/src/main/res/drawable-nodpi/gruese_die_gema_unangebracht.png
--- a/app/src/main/res/drawable-nodpi/ic_cast_black.png
+++ b/app/src/main/res/drawable-nodpi/ic_cast_black.png
--- a/app/src/main/res/drawable-nodpi/ic_file_download_black.png
+++ b/app/src/main/res/drawable-nodpi/ic_file_download_black.png
--- a/app/src/main/res/drawable-nodpi/ic_headset_black.png
+++ b/app/src/main/res/drawable-nodpi/ic_headset_black.png
--- a/app/src/main/res/drawable-nodpi/ic_play_arrow_black.png
+++ b/app/src/main/res/drawable-nodpi/ic_play_arrow_black.png
--- a/app/src/main/res/drawable-nodpi/ic_screen_rotation_white.png
+++ b/app/src/main/res/drawable-nodpi/ic_screen_rotation_white.png
--- a/app/src/main/res/drawable-nodpi/ic_share_black.png
+++ b/app/src/main/res/drawable-nodpi/ic_share_black.png
--- a/app/src/main/res/drawable-nodpi/not_available_monkey.png
+++ b/app/src/main/res/drawable-nodpi/not_available_monkey.png
--- a/app/src/main/res/drawable-nodpi/thumbs_down.png
+++ b/app/src/main/res/drawable-nodpi/thumbs_down.png
--- a/app/src/main/res/drawable-nodpi/thumbs_up.png
+++ b/app/src/main/res/drawable-nodpi/thumbs_up.png
--- a/app/src/main/res/drawable/ai_play.png
+++ b/app/src/main/res/drawable/ai_play.png
--- a/app/src/main/res/drawable/ai_share.png
+++ b/app/src/main/res/drawable/ai_share.png
--- a/app/src/main/res/drawable/gruese_die_gema_original.png
+++ b/app/src/main/res/drawable/gruese_die_gema_original.png
--- a/app/src/main/res/drawable/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable/ic_arrow_back_white.png
--- a/app/src/main/res/drawable/ic_share_white.png
+++ b/app/src/main/res/drawable/ic_share_white.png
--- a/app/src/main/res/drawable/new_pipe_watermark.png
+++ b/app/src/main/res/drawable/new_pipe_watermark.png
--- a/app/src/main/res/drawable/thumbs_down.png
+++ b/app/src/main/res/drawable/thumbs_down.png
--- a/app/src/main/res/drawable/thumbs_up.png
+++ b/app/src/main/res/drawable/thumbs_up.png
--- a/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
@@ -25,7 +25,8 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:iconifiedByDefault="false"
-            android:focusable="false"/>
+            android:focusable="false"
+            tools:ignore="InconsistentLayout" />

        <fragment android:id="@+id/videoitem_list"
            android:name="org.schabi.newpipe.VideoItemListFragment"
@@ -42,15 +43,10 @@
        android:layout_width="0dp"
        android:layout_weight="4">

-        <ImageView android:id="@+id/list_view_watermark"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="10dp"
-            android:src="@drawable/new_pipe_watermark"/>
-
        <FrameLayout android:id="@+id/videoitem_detail_container"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"  />
+            android:layout_height="match_parent"
+            tools:ignore="InconsistentLayout" />

    </LinearLayout>

--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/videoitem_detail"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:textIsSelectable="true"
-    tools:context=".VideoItemDetailFragment">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp">
-
-        <ProgressBar android:id="@+id/detailProgressBar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
-
-        <ImageView android:id="@+id/detailThumbnailView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:adjustViewBounds="true"
-            android:src="@drawable/dummi_thumbnail"
-            android:visibility="invisible"/>
-
-        <TextView android:id="@+id/detailVideoTitleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Bla blabla !!!"
-            android:visibility="invisible"/>
-
-        <ImageView android:id="@+id/detailUploaderThumbnailView"
-            android:layout_width="80dp"
-            android:layout_height="100dp"
-            android:paddingTop="25dp"
-            android:paddingLeft="5dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentLeft="true"
-            android:visibility="invisible"
-            android:src="@drawable/budy" />
-
-        <TextView android:id="@+id/detailUploaderView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Herr von Gurken" />
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dp"
-            android:background="@android:color/darker_gray"
-            android:layout_below="@id/detailUploaderView"
-            android:paddingTop="20dp"
-            android:visibility="invisible"
-            android:layout_alignParentLeft="true" />
-
-        <TextView android:id="@+id/detailViewCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentRight="true"
-            android:paddingTop="70dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="1.000.115 views" />
-
-        <TextView android:id="@+id/detailThumbsDownCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_alignParentRight="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="5.000" />
-
-        <ImageView android:id="@+id/detailThumbsDownImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_down" />
-
-        <TextView android:id="@+id/detailThumbsUpCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownImgView"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="111.111" />
-
-        <ImageView android:id="@+id/detailThumbsUpImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsUpCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_up" />
-
-        <TextView android:id="@+id/detailUploadDateView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingTop="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Uploaded at: 45.64.1285" />
-
-        <TextView android:id="@+id/detailDescriptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploadDateView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-            />
-
-    </RelativeLayout>
-
-</ScrollView>
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
+    style="?android:attr/textAppearanceLarge"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/videoitem_detail">
+
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detailThumbnailViewDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:background="@android:color/black"
+        android:src="@drawable/dummy_thumbnail_dark"
+        tools:ignore="RtlHardcoded" />
+
+    <ScrollView
+        android:id="@+id/detailMainContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:id="@+id/detailVideoThumbnailWindowLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
+                android:background="?attr/selectableItemBackground">
+
+                <ProgressBar android:id="@+id/detailProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:indeterminate="true"/>
+
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/playVideoButton"
+                    android:visibility="invisible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    app:backgroundTint="@color/primaryColorYoutube"
+                    android:src="@drawable/ic_play_arrow_black"
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
+
+                <Button
+                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout android:id="@+id/detailTextContentLayout"
+                android:visibility="invisible"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/video_item_detail_info_text_padding"
+                android:layout_below="@id/detailVideoThumbnailWindowLayout"
+                android:background="@color/background_gray">
+
+                <TextView android:id="@+id/detailVideoTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_title_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailUploaderView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderThumbnailView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_uploader_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailThumbsDownCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                    android:src="@drawable/thumbs_down"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailThumbsUpCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                    android:layout_toStartOf="@id/detailThumbsDownImgView"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
+                    android:src="@drawable/thumbs_up"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailUploadDateView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <TextView android:id="@+id/detailDescriptionView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploadDateView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_description_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/nextVideoTitle"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/showSimilarVideosButtonText"/>
+                </RelativeLayout>
+
+            </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
--- a/app/src/main/res/layout/activity_play_video.xml
+++ b/app/src/main/res/layout/activity_play_video.xml
@@ -1,25 +1,27 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="@android:color/black"
    tools:context="org.schabi.newpipe.PlayVideoActivity"
    android:gravity="center">

    <VideoView android:id="@+id/video_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:focusable="false"/>

    <Button android:id="@+id/content_button"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:background="@null" />
+        android:background="@null"
+        android:focusable="false"/>

    <ProgressBar android:id="@+id/play_video_progress_bar"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:indeterminate="true"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:focusable="false"/>

-</FrameLayout>
+</merge>
--- a/app/src/main/res/layout/activity_videoitem_list.xml
+++ b/app/src/main/res/layout/activity_videoitem_list.xml
@@ -1,13 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ImageView android:id="@+id/list_view_watermark"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="10dp"
-        android:src="@drawable/new_pipe_watermark"/>
+    android:orientation="vertical">

    <fragment
        xmlns:tools="http://schemas.android.com/tools"
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -1,133 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>

-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/videoitem_detail"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
    style="?android:attr/textAppearanceLarge"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:textIsSelectable="true"
-    tools:context=".VideoItemDetailFragment">
+    android:id="@+id/videoitem_detail">

-    <RelativeLayout
+    <ScrollView
+        android:id="@+id/detailMainContent"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        tools:ignore="UselessParent">

-        <ProgressBar android:id="@+id/detailProgressBar"
+        <RelativeLayout
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
+            android:layout_height="wrap_content">

-        <ImageView android:id="@+id/detailThumbnailView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="centerInside"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:adjustViewBounds="true"
-            android:visibility="invisible"
-            android:src="@drawable/dummi_thumbnail"/>
+            <RelativeLayout
+                android:id="@+id/detailVideoThumbnailWindowLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground">

-        <TextView android:id="@+id/detailVideoTitleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingBottom="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Bla blabla !!!"/>
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:contentDescription="@string/detailThumbnailViewDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="fitCenter"
+                    android:adjustViewBounds="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:background="@android:color/black"
+                    android:src="@drawable/dummy_thumbnail_dark"/>

-        <ImageView android:id="@+id/detailUploaderThumbnailView"
-            android:layout_width="85dp"
-            android:layout_height="100dp"
-            android:paddingTop="25dp"
-            android:paddingLeft="2dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentLeft="true"
-            android:visibility="invisible"
-            android:src="@drawable/budy" />
+                <ProgressBar android:id="@+id/detailProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:indeterminate="true"/>

-        <TextView android:id="@+id/detailUploaderView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Herr von Gurken" />
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/playVideoButton"
+                    android:visibility="invisible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    app:backgroundTint="@color/primaryColorYoutube"
+                    android:src="@drawable/ic_play_arrow_black"
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>

-        <TextView android:id="@+id/detailViewCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="25dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentRight="true"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="drölf views" />
+                <Button
+                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>

-        <TextView android:id="@+id/detailThumbsDownCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_alignParentRight="true"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="-5.000" />
+            </RelativeLayout>

-        <ImageView android:id="@+id/detailThumbsDownImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_down" />
+            <RelativeLayout android:id="@+id/detailTextContentLayout"
+                android:visibility="invisible"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/video_item_detail_info_text_padding"
+                android:layout_below="@id/detailVideoThumbnailWindowLayout"
+                android:background="@color/background_gray">

-        <TextView android:id="@+id/detailThumbsUpCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownImgView"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="∞" />
+                <TextView android:id="@+id/detailVideoTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_title_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"/>

-        <ImageView android:id="@+id/detailThumbsUpImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsUpCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_up" />
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy" />

-        <TextView android:id="@+id/detailUploadDateView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingTop="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Uploaded at: 45.64.1285" />
+                <TextView android:id="@+id/detailUploaderView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderThumbnailView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_uploader_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />

-        <TextView android:id="@+id/detailDescriptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploadDateView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-            />
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />

-    </RelativeLayout>
+                <TextView android:id="@+id/detailThumbsDownCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />

-</ScrollView>
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:src="@drawable/thumbs_down" />
+
+                <TextView android:id="@+id/detailThumbsUpCountView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                    android:layout_toStartOf="@id/detailThumbsDownImgView"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
+                    android:src="@drawable/thumbs_up" />
+
+                <TextView android:id="@+id/detailUploadDateView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploaderView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView android:id="@+id/detailDescriptionView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailUploadDateView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_description_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/nextVideoTitle"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/showSimilarVideosButtonText"/>
+                </RelativeLayout>
+
+            </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
+</FrameLayout>
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -1,42 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="6dp">
+    android:layout_height="wrap_content" >

-    <ImageView android:id="@+id/itemThumbnailView"
-        android:layout_width="125dp"
-        android:layout_height="70dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/dummi_thumbnail"/>
-
-    <TextView android:id="@+id/itemVideoTitleView"
-        android:layout_width="wrap_content"
-        android:layout_height="55dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_alignParentTop="true"
-        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <TextView android:id="@+id/itemUploaderView"
-        android:layout_width="wrap_content"
+    <android.support.v7.widget.CardView
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemVideoTitleView"
-        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
+        card_view:cardCornerRadius="@dimen/video_item_search_card_radius"
+        android:layout_marginTop="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginBottom="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginLeft="@dimen/video_item_search_card_horizontal_margin"
+        android:layout_marginRight="@dimen/video_item_search_card_horizontal_margin" >

-    <TextView android:id="@+id/itemDurationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemUploaderView"
-        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/video_item_search_card_padding">

+            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
+                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:ignore="RtlHardcoded">

+                <ImageView android:id="@+id/itemThumbnailView"
+                    android:contentDescription="@string/itemThumbnailViewDescription"
+                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                    android:scaleType="centerCrop"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:src="@drawable/dummy_thumbnail"/>

-</RelativeLayout>
+                <TextView android:id="@+id/itemDurationView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/itemThumbnailView"
+                    android:layout_alignRight="@id/itemThumbnailView"
+                    android:layout_alignEnd="@id/itemThumbnailView"
+                    android:layout_marginRight="@dimen/video_item_search_duration_margin"
+                    android:layout_marginEnd="@dimen/video_item_search_duration_margin"
+                    android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+                    android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+                    android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_duration_text_size"
+                    android:background="@color/durationBackground"
+                    android:textColor="@color/durationText"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                android:layout_toRightOf="@id/itemThumbnailViewContainer"
+                tools:ignore="RtlHardcoded">
+
+                <TextView android:id="@+id/itemVideoTitleView"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0dp"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textSize="@dimen/video_item_search_title_text_size"/>
+
+                <TextView android:id="@+id/itemUploaderView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_uploader_text_size"/>
+
+                <TextView android:id="@+id/itemUploadDateView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_upload_date_text_size"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+</LinearLayout>
--- a/app/src/main/res/menu/videoitem_detail.xml
+++ b/app/src/main/res/menu/videoitem_detail.xml
@@ -1,25 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menu_item_play"
-        android:title="@string/play"
-        app:showAsAction="always"
-        android:icon="@drawable/ai_play"/>
+
+    <item android:id="@+id/menu_item_play_audio"
+        android:title="@string/playAudio"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_headset_black" />
+
+    <item android:id="@+id/menu_item_download"
+        app:showAsAction="ifRoom"
+        android:title="@string/download"
+        android:icon="@drawable/ic_file_download_black"/>

    <item android:id="@+id/menu_item_share"
        android:title="@string/share"
        app:showAsAction="ifRoom"
-        android:icon="@drawable/ai_share"/>
+        android:icon="@drawable/ic_share_black"/>
+
+    <item android:id="@+id/action_play_with_kodi"
+        android:title="@string/playWithKodiTitle"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_cast_black"/>

    <item android:id="@+id/menu_item_openInBrowser"
        app:showAsAction="never"
        android:title="@string/open_in_browser" />

-    <item android:id="@+id/menu_item_download"
-        app:showAsAction="never"
-        android:title="@string/download"/>
-
    <item android:id="@+id/action_settings"
        app:showAsAction="never"
        android:title="@string/settings"/>
+
+
 </menu>
--- a/app/src/main/res/menu/videoitem_list.xml
+++ b/app/src/main/res/menu/videoitem_list.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <item android:id="@+id/action_search"
        android:icon="@android:drawable/ic_menu_search"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
        android:title="@string/search"
        app:actionViewClass="android.support.v7.widget.SearchView" />

--- a/app/src/main/res/menu/videoitem_two_pannel.xml
+++ b/app/src/main/res/menu/videoitem_two_pannel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/action_settings"
+        app:showAsAction="never"
+        android:title="@string/settings"/>
+
+</menu>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,20 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
-    <string name="nothingFound">Nichts gefunden</string>
-    <string name="viewSufix">views</string>
-    <string name="uploadDatePrefix">Hochgeladen am: </string>
+    <string name="viewCountText">%1$s Aufrufe</string>
+    <string name="uploadDateText">Hochgeladen am %1$s</string>
    <string name="noPlayerFound">Keinen Streamplayer gefunden. Vielleicht möchtest du einen installieren.</string>
    <string name="installStreamPlayer">Jetzt installieren</string>
    <string name="cancel">Abbrechen</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
    <string name="open_in_browser">In Browser öffnen</string>
    <string name="share">Teilen</string>
-    <string name="play">Play</string>
    <string name="download">Download</string>
    <string name="search">Suchen</string>
    <string name="settings">Einstellungen</string>
-    <string name="sendWith">Senden mit</string>
    <string name="didYouMean">Meintest du: </string>
    <string name="searchPage">Suchseite: </string>
    <string name="shareDialogTitle">Teilen mit:</string>
@@ -22,7 +17,37 @@
    <string name="screenRotation">Rotation</string>
    <string name="title_activity_settings">Einstellungen</string>
    <string name="useExternalPlayerTitle">Externen Player benutzen</string>
-    <string name="downloadLocation">Download Verzeichnis</string>
+    <string name="downloadLocation">Downloadverzeichnis</string>
    <string name="downloadLocationSummary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
    <string name="downloadLocationDialogTitle">Download Verzeichnis eingeben</string>
+    <string name="autoPlayThroughIntentTitle">Automatisches Abspielen durch Intent</string>
+    <string name="autoPlayThroughIntentSummary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
+    <string name="defaultResolutionPreferenceTitle">Standard Auflösung</string>
+    <string name="playWithKodiTitle">Mit Kodi abspielen</string>
+    <string name="koreNotFound">Kore app wurde nicht gefunden. Kore wird benötigt, um Videos mit Kodi wieder zu geben.</string>
+    <string name="installeKore">Kore installieren</string>
+    <string name="showPlayWithKodiTitle">Zeige \"Mit Kodi abspielen\" Option</string>
+    <string name="showPlayWithKodiSummary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Bevorzugtes Audio Format</string>
+    <string name="webMAudioDescription">WebM - freies Format</string>
+    <string name="m4aAudioDescription">m4a - bessere Qualität</string>
+    <string name="downloadDialogTitle">Herunterladen</string>
+    <string-array name="downloadOptions">
+        <item>Video</item>
+        <item>Audio</item>
+    </string-array>
+    <string name="nextVideoTitle">Nächstes Video</string>
+    <string name="showNextAndSimilarTitle">Zeige nächstes und ähnliche Videos</string>
+    <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
+    <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
+    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">ETC</string>
+<string name="searchLanguageTitle">Bevorzugte Sprache</string>
+    <string name="itemThumbnailViewDescription">Video-Vorschau-Bild</string>
+    <string name="detailThumbnailViewDescription">Video-Vorschau-Bild</string>
+    <string name="detailUploaderThumbnailViewDescription">Nutzerbild</string>
+    <string name="detailThumbsDownImgViewDescription">gefällt nicht</string>
+    <string name="detailThumbsUpImgViewDescription">gefällt</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="viewCountText">%1$s visitas</string>
+    <string name="uploadDateText">Subido el %1$s</string>
+    <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
+    <string name="installStreamPlayer">Instalarlo</string>
+    <string name="cancel">Cancelar</string>
+    <string name="open_in_browser">Abrir en el navegador</string>
+    <string name="share">Compartir</string>
+    <string name="download">Descargar</string>
+    <string name="search">Buscar</string>
+    <string name="settings">Ajustes</string>
+    <string name="didYouMean">"¿Querías decir?: "</string>
+    <string name="searchPage">Buscar página: </string>
+    <string name="shareDialogTitle">Compartir con:</string>
+    <string name="chooseBrowser">Selecciona navegador:</string>
+    <string name="screenRotation">rotación</string>
+    <string name="title_activity_settings">Ajustes</string>
+    <string name="useExternalPlayerTitle">Usar reproductor externo</string>
+    <string name="downloadLocation">Descargar en&#8230;</string>
+    <string name="downloadLocationSummary">Ruta donde guardar los vídeos descargados.</string>
+    <string name="downloadLocationDialogTitle">Localización del directorio de descargas</string>
+    <string name="autoPlayThroughIntentTitle">Reproducción automática</string>
+    <string name="autoPlayThroughIntentSummary">Reproducir los vídeos automaticamente cuando se llama desde otra aplicación.</string>
+    <string name="defaultResolutionPreferenceTitle">Resolución por defecto</string>
+    <string name="playWithKodiTitle">Reproducir con Kodi</string>
+    <string name="koreNotFound">Aplicación Kore no encontrada. Kore es necesario para reproducir vídeos con Kodi media center.</string>
+    <string name="installeKore">Instalar Kore</string>
+    <string name="showPlayWithKodiTitle">Mostrar la opción \"Reproducir con Kodi\"</string>
+    <string name="showPlayWithKodiSummary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Formato de audio por defecto</string>
+    <string name="webMAudioDescription">WebM - formato libre</string>
+    <string name="m4aAudioDescription">m4a - mejor calidad</string>
+    <string name="downloadDialogTitle">Descargar</string>
+    <string name="nextVideoTitle">Siguiente vídeo</string>
+    <string name="urlNotSupportedText">URL no soportada.</string>
+    <string name="showSimilarVideosButtonText">Vídeos similares</string>
+</resources>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="viewCountText">%1$s نماها</string>
+    <string name="uploadDateText">بارگذاری‌شده در: %1$s</string>
+    <string name="noPlayerFound">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
+    <string name="installStreamPlayer">نصب کنید</string>
+    <string name="cancel">انصراف</string>
+    <string name="open_in_browser">بازکردن در مرورگر</string>
+    <string name="share">هم‌رسانی</string>
+    <string name="download">بارگیری</string>
+    <string name="search">جستجو</string>
+    <string name="settings">تنظیمات</string>
+    <string name="didYouMean">منظورتان این است: </string>
+    <string name="searchPage">صفحه‌ی جستجو: </string>
+    <string name="shareDialogTitle">هم‌رسانی با:</string>
+    <string name="chooseBrowser">مرورگر را برگزینید:</string>
+    <string name="screenRotation">چرخش</string>
+    <string name="title_activity_settings">تنظیمات</string>
+    <string name="useExternalPlayerTitle">استفاده از پخش‌کننده‌ی خارجی</string>
+    <string name="downloadLocation">محل بارگیری</string>
+    <string name="downloadLocationSummary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
+    <string name="downloadLocationDialogTitle">مسیر دریافت را وارد کنید</string>
+    <string name="autoPlayThroughIntentTitle">پخش خودکار از Intent</string>
+    <string name="autoPlayThroughIntentSummary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
+    <string name="defaultResolutionPreferenceTitle">وضوح پیش‌فرض</string>
+    <string name="playWithKodiTitle">پخش با Kodi</string>
+    <string name="koreNotFound">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
+    <string name="installeKore">نصب Kore</string>
+    <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
+    <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
+    <string name="playAudio">صدا</string>
+    <string name="defaultAudioFormatTitle">قالب پیش‌فرض صدا</string>
+    <string name="webMAudioDescription">WebM - قالبی آزاد</string>
+    <string name="m4aAudioDescription">m4a - کیفیت بهتر</string>
+    <string name="downloadDialogTitle">دریافت</string>
+    <string-array name="downloadOptions">
+        <item>ویدئو</item>
+        <item>صدا</item>
+    </string-array>
+    <string name="nextVideoTitle">ویدئوی بعدی</string>
+    <string name="urlNotSupportedText">پیوند پشتیبانی نمی‌شود.</string>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appelée depuis une autre application.</string>
+    <string name="cancel">Annuler</string>
+    <string name="chooseBrowser">Choisir un navigateur :</string>
+    <string name="defaultResolutionPreferenceTitle">Résolution par défaut</string>
+    <string name="didYouMean">"S\'agirait-il de : "</string>
+    <string name="download">Télécharger</string>
+    <string name="downloadLocation">Emplacement des téléchargements</string>
+    <string name="downloadLocationDialogTitle">Entrez l\'emplacement du téléchargement</string>
+    <string name="downloadLocationSummary">Emplacement des vidéos téléchargées.</string>
+    <string name="installStreamPlayer">Installer</string>
+    <string name="installeKore">Installer Kore</string>
+    <string name="koreNotFound">L\'application Kore est introuvable. Kore est nécessaire afin de lire des vidéos dans Kodi media center.</string>
+    <string name="noPlayerFound">Aucun lecteur de streaming détecté. Vous devriez en installer un.</string>
+    <string name="open_in_browser">Ouvrir dans le navigateur</string>
+    <string name="autoPlayThroughIntentTitle">Lecture automatique via Intent</string>
+    <string name="playWithKodiTitle">Lire avec Kodi</string>
+    <string name="screenRotation">rotation</string>
+    <string name="search">Rechercher</string>
+    <string name="searchPage">"Rechercher dans la page : "</string>
+    <string name="settings">Paramètres</string>
+    <string name="share">Partager</string>
+    <string name="shareDialogTitle">Partager avec :</string>
+    <string name="showPlayWithKodiSummary">Afficher une option pour lire la vidéo avec Kodi media center.</string>
+    <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="uploadDateText">Mise en ligne le %1$s</string>
+    <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
+    <string name="viewCountText">%1$s vues</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Format audio par défaut</string>
+    <string name="webMAudioDescription">WebM- format libre</string>
+    <string name="m4aAudioDescription">m4a - meilleur qualité</string>
+    <string name="downloadDialogTitle">Télécharger</string>
+    <string name="nextVideoTitle">Vidéo suivante</string>
+    <string name="showNextAndSimilarTitle">Afficher les vidéos suivantes et similaires</string>
+    <string name="urlNotSupportedText">URL non supportée.</string>
+    <string name="showSimilarVideosButtonText">Vidéos similaires</string>
+    <string name="settingsCategoryVideoAudioTitle">VIDÉO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFORMATION</string>
+    <string name="settingsCategoryEtcTitle">DIVERS</string>
+
+    <string name="itemThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
+    <string name="detailThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
+    <string name="detailThumbsDownImgViewDescription">Je n\'aime pas</string>
+    <string name="detailThumbsUpImgViewDescription">J\'aime</string>
+<string name="searchLanguageTitle">Langue du contenu</string>
+    <string name="detailUploaderThumbnailViewDescription">Avatar de l\'utilisateur</string>
+    </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="viewCountText">%1$s megtekintés</string>
+    <string name="uploadDateText">Feltöltve: %1$s</string>
+    <string name="noPlayerFound">Nem található lejátszó. Telepítsen egyet!</string>
+    <string name="installStreamPlayer">Telepítsen egyet</string>
+    <string name="cancel">Mégse</string>
+    <string name="open_in_browser">Megnyitás böngészőben</string>
+    <string name="share">Megosztás</string>
+    <string name="download">Letöltés</string>
+    <string name="search">Keresés</string>
+    <string name="settings">Beállítások</string>
+    <string name="didYouMean">Erre gondolt: </string>
+    <string name="searchPage">Keresési lap: </string>
+    <string name="shareDialogTitle">Megosztás ezzel:</string>
+    <string name="chooseBrowser">Válasszon böngészőt:</string>
+    <string name="screenRotation">forgatás</string>
+    <string name="title_activity_settings">Beállítások</string>
+    <string name="useExternalPlayerTitle">Külső lejátszó használata</string>
+    <string name="downloadLocation">Letöltések helye</string>
+    <string name="downloadLocationSummary">Útvonal a letöltött videók tárolásához</string>
+    <string name="downloadLocationDialogTitle">Adja meg a letöltési útvonalat</string>
+    <string name="autoPlayThroughIntentTitle">Automatikus lejátszás Intent-en keresztül</string>
+    <string name="autoPlayThroughIntentSummary">Automatikusan elindítja a videót, ha az külső alkalmazásból volt hívva</string>
+    <string name="defaultResolutionPreferenceTitle">Alapértelmezett felbontás</string>
+    <string name="playWithKodiTitle">Lejátszás Kodi-val</string>
+    <string name="koreNotFound">A Kore alkalmazás nem található. A Kore szükséges a videók Kodi médiaközponttal való lejátszásához.</string>
+    <string name="installeKore">Kore telepítése</string>
+    <string name="showPlayWithKodiTitle">\"Lejátszás Kodi-val\" opció mutatása</string>
+    <string name="showPlayWithKodiSummary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
+    <string name="playAudio">Hang</string>
+    <string name="defaultAudioFormatTitle">Alapértelmezett hang formátum</string>
+    <string name="webMAudioDescription">WebM - szabad formátum</string>
+    <string name="m4aAudioDescription">m4a - jobb minőség</string>
+    <string name="downloadDialogTitle">Letöltés</string>
+    <string-array name="downloadOptions">
+        <item>Videó</item>
+        <item>Hang</item>
+    </string-array>
+<string name="nextVideoTitle">Következő videó</string>
+    <string name="urlNotSupportedText">A webcím nem támogatott.</string>
+<string name="showSimilarVideosButtonText">Hasonló videók</string>
+    </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="viewCountText">%1$s visite</string>
+    <string name="uploadDateText">Caricato in %1$s</string>
+    <string name="noPlayerFound">Nessun riproduttore trovato. Dovresti installarne uno.</string>
+    <string name="installStreamPlayer">Installa</string>
+    <string name="cancel">Cancella</string>
+    <string name="open_in_browser">Apri nel browser</string>
+    <string name="share">Condividi</string>
+    <string name="download">Scarica</string>
+    <string name="search">Cerca</string>
+    <string name="settings">Impostazioni</string>
+    <string name="didYouMean">"Intendevi: "</string>
+    <string name="searchPage">"Cerca pagina: "</string>
+    <string name="shareDialogTitle">Condividi con:</string>
+    <string name="chooseBrowser">Scegli browser:</string>
+    <string name="screenRotation">rotazione</string>
+    <string name="title_activity_settings">Impostazioni</string>
+    <string name="useExternalPlayerTitle">Usa un riproduttore video esterno</string>
+    <string name="downloadLocation">Cartella di download</string>
+    <string name="downloadLocationSummary">Percorso dove memorizzare i video scaricati.</string>
+    <string name="downloadLocationDialogTitle">Inserisci il percorso di download</string>
+    <string name="autoPlayThroughIntentTitle">Auto riproduzione attraverso internet</string>
+    <string name="autoPlayThroughIntentSummary">Avvia automaticamente un video quando è stato chiamato da un\'altra applicazione.</string>
+    <string name="defaultResolutionPreferenceTitle">Risoluzione predefinita</string>
+    <string name="playWithKodiTitle">Riproduci con Kodi</string>
+    <string name="koreNotFound">Kore app non trovata. Kore è richiesto per riprodurre video con Kodi media center.</string>
+    <string name="installeKore">Installa Kore</string>
+    <string name="showPlayWithKodiTitle">Mostra l\'opzione \"Riproduci con Kodi\"</string>
+    <string name="showPlayWithKodiSummary">Mostra un opzione per riprodurre un video attraverso Kodi media center.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Formato audio predefinito</string>
+    <string name="webMAudioDescription">WedM - formato libero</string>
+    <string name="m4aAudioDescription">m4a - qualità migliore</string>
+    <string name="downloadDialogTitle">Scarica</string>
+    <string name="nextVideoTitle">Prossimo video</string>
+    <string name="showNextAndSimilarTitle">Mostra i video successivi e simili</string>
+    <string name="urlNotSupportedText">URL non supportato.</string>
+    <string name="showSimilarVideosButtonText">Video simili</string>
+    <string name="searchLanguageTitle">Lingua preferita dei contenuti</string>
+    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">ETC</string>
+
+    <string name="itemThumbnailViewDescription">Anteprima video</string>
+    <string name="detailThumbnailViewDescription">Anteprima video</string>
+    <string name="detailUploaderThumbnailViewDescription">Miniatura caricata</string>
+    <string name="detailThumbsDownImgViewDescription">Non mi piace</string>
+    <string name="detailThumbsUpImgViewDescription">Mi piace</string>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="uploadDateText">"アップロード: "%1$s</string>
+    <string name="noPlayerFound">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
+    <string name="installStreamPlayer">ｲﾝｽﾄｰﾙ</string>
+    <string name="cancel">取り消し</string>
+    <string name="open_in_browser">ﾌﾞﾗｳｻﾞｰで開く</string>
+    <string name="share">共有</string>
+    <string name="download">ﾀﾞｳﾝﾛｰﾄﾞ</string>
+    <string name="search">検索</string>
+    <string name="settings">設定</string>
+    <string name="didYouMean">"この意味ですか: "</string>
+    <string name="searchPage">"検索ﾍﾟｰｼﾞ: "</string>
+    <string name="shareDialogTitle">…共有:</string>
+    <string name="chooseBrowser">ﾌﾞﾗｳｻﾞｰを選択:</string>
+    <string name="screenRotation">回転</string>
+    <string name="title_activity_settings">設定</string>
+    <string name="useExternalPlayerTitle">外部ﾌﾟﾚｰﾔｰを使用する</string>
+    <string name="downloadLocation">ﾀﾞｳﾝﾛｰﾄﾞする場所</string>
+    <string name="downloadLocationSummary">ﾀﾞｳﾝﾛｰﾄﾞした動画を保存する場所のﾊﾟｽ｡</string>
+    <string name="downloadLocationDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞのﾊﾟｽを入力してください｡</string>
+    <string name="autoPlayThroughIntentTitle">ｲﾝﾃﾝﾄで自動再生</string>
+    <string name="autoPlayThroughIntentSummary">他のｱﾌﾟﾘｹｰｼｮﾝから呼び出されたとき､自動的に動画再生を開始します｡</string>
+    <string name="defaultResolutionPreferenceTitle">基本の解像度</string>
+    <string name="playWithKodiTitle">Kodi で再生</string>
+    <string name="koreNotFound">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
+    <string name="installeKore">Kore をｲﾝｽﾄｰﾙ</string>
+    <string name="showPlayWithKodiTitle">\"Kodi で再生\" 設定を表示</string>
+    <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
+    <string name="playAudio">ｵｰﾃﾞｨｵ</string>
+    <string name="defaultAudioFormatTitle">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
+    <string name="webMAudioDescription">.WebM - ﾌﾘｰﾌｫｰﾏｯﾄ</string>
+    <string name="m4aAudioDescription">.m4a - より良い品質</string>
+    <string name="downloadDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞ</string>
+    <string name="nextVideoTitle">次の動画</string>
+    <string name="showNextAndSimilarTitle">次の同様の動画を表示します｡</string>
+    <string name="urlNotSupportedText">URL は使用できません｡</string>
+    <string name="showSimilarVideosButtonText">同様の動画</string>
+    <string name="searchLanguageTitle">優先される言語</string>
+    <string name="settingsCategoryVideoAudioTitle">動画とｵｰﾃﾞｨｵ</string>
+    <string name="settingsCategoryVideoInfoTittle">情報</string>
+    <string name="settingsCategoryEtcTitle">その他</string>
+<string name="viewCountText">%1$s ビュー</string>
+    <string name="itemThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
+    <string name="detailThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
+    <string name="detailUploaderThumbnailViewDescription">アップローダー サムネイル</string>
+    <string name="detailThumbsDownImgViewDescription">いいね解除</string>
+    <string name="detailThumbsUpImgViewDescription">いいね</string>
+</resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="viewCountText">시청 횟수 %1$s</string>
+    <string name="uploadDateText">%1$s에 업로드됨</string>
+    <string name="noPlayerFound">스트리밍 플레이어가 발견되지 않았습니다. 플레이어를 설치하시기 바랍니다.</string>
+    <string name="installStreamPlayer">설치</string>
+    <string name="cancel">취소</string>
+    <string name="open_in_browser">브라우저에서 열기</string>
+    <string name="share">공유</string>
+    <string name="download">다운로드</string>
+    <string name="search">검색</string>
+    <string name="settings">설정</string>
+    <string name="didYouMean">"혹시 이것을 검색하셨습니까? "</string>
+    <string name="searchPage">"검색 페이지: "</string>
+    <string name="shareDialogTitle">다음으로 공유:</string>
+    <string name="chooseBrowser">브라우저 선택:</string>
+    <string name="screenRotation">회전</string>
+    <string name="title_activity_settings">설정</string>
+    <string name="useExternalPlayerTitle">외부 플레이어 사용</string>
+    <string name="downloadLocation">다운로드 위치</string>
+    <string name="downloadLocationSummary">다운로드된 비디오가 저장될 경로를 선택하세요.</string>
+    <string name="downloadLocationDialogTitle">다운로드 경로 입력</string>
+    <string name="autoPlayThroughIntentTitle">인텐트로 경유할 경우 자동 재생</string>
+    <string name="autoPlayThroughIntentSummary">다른 앱으로부터 호출되었을 경우에 비디오를 자동으로 재생합니다.</string>
+    <string name="defaultResolutionPreferenceTitle">기본 해상도</string>
+    <string name="playWithKodiTitle">Kodi로 재생</string>
+    <string name="koreNotFound">Kore 앱이 발견되지 않았습니다. Kodi media center로 비디오를 재생하려면 Kore가 필요합니다.</string>
+    <string name="installeKore">Kore 설치</string>
+    <string name="showPlayWithKodiTitle">\"Kodi로 재생\" 옵션 표시</string>
+    <string name="showPlayWithKodiSummary">비디오를 Kodi media center를 사용해 재생하는 옵션을 표시합니다.</string>
+    <string name="playAudio">오디오</string>
+    <string name="defaultAudioFormatTitle">기본 오디오 포맷</string>
+    <string name="webMAudioDescription">WebM - 무료 자유 포맷입니다</string>
+    <string name="m4aAudioDescription">m4a - 보다 나은 품질</string>
+    <string name="downloadDialogTitle">다운로드</string>
+    <string name="nextVideoTitle">다음 비디오</string>
+    <string name="showNextAndSimilarTitle">다음 및 유사한 비디오 표시</string>
+    <string name="urlNotSupportedText">지원하지 않는 URL 입니다.</string>
+    <string name="showSimilarVideosButtonText">유사한 비디오</string>
+    <string name="searchLanguageTitle">선호하는 컨텐츠 언어</string>
+    <string name="settingsCategoryVideoAudioTitle">비디오 &amp; 오디오</string>
+    <string name="settingsCategoryVideoInfoTittle">정보</string>
+    <string name="settingsCategoryEtcTitle">기타</string>
+
+    <string name="itemThumbnailViewDescription">비디오 미리보기 썸네일</string>
+    <string name="detailThumbnailViewDescription">비디오 미리보기 썸네일</string>
+    <string name="detailUploaderThumbnailViewDescription">업로더 썸네일</string>
+    <string name="detailThumbsDownImgViewDescription">싫어요</string>
+    <string name="detailThumbsUpImgViewDescription">좋아요</string>
+</resources>
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Search View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_search_title_text_size">22sp</dimen>
+    <dimen name="video_item_search_duration_text_size">16sp</dimen>
+    <dimen name="video_item_search_uploader_text_size">18sp</dimen>
+    <dimen name="video_item_search_upload_date_text_size">18sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_search_card_vertical_margin">5dp</dimen>
+    <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
+    <dimen name="video_item_search_card_padding">10dp</dimen>
+    <dimen name="video_item_search_image_right_margin">10dp</dimen>
+    <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
+    <dimen name="video_item_search_duration_horizontal_padding">7sp</dimen>
+    <dimen name="video_item_search_duration_margin">5sp</dimen>
+    <!-- Miscellaneous -->
+    <dimen name="video_item_search_card_radius">4dp</dimen>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">24sp</dimen>
+    <dimen name="video_item_detail_views_text_size">18sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">16sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">18sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">18sp</dimen>
+    <dimen name="video_item_detail_description_text_size">18sp</dimen>
+    <dimen name="video_item_detail_next_text_size">20sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">20sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">240dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
+    <dimen name="video_item_detail_like_image_height">20sp</dimen>
+    <dimen name="video_item_detail_like_image_width">20sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
+    <dimen name="video_item_detail_like_margin">10sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="viewCountText">%1$s keer bekeken</string>
+    <string name="uploadDateText">Geüpload op %1$s</string>
+    <string name="noPlayerFound">Geen speler met streaming ondersteuning gevonden. Misschien wil je er een installeren.</string>
+    <string name="installStreamPlayer">Installeer speler</string>
+    <string name="cancel">Annuleer</string>
+    <string name="open_in_browser">Open in browser</string>
+    <string name="share">Deel</string>
+    <string name="download">Download</string>
+    <string name="search">Zoek</string>
+    <string name="settings">Instellingen</string>
+    <string name="didYouMean">Bedoelde je: </string>
+    <string name="searchPage">Zoekpagina: </string>
+    <string name="shareDialogTitle">Deel met:</string>
+    <string name="chooseBrowser">Kies browser:</string>
+    <string name="screenRotation">rotatie</string>
+    <string name="title_activity_settings">Instellingen</string>
+    <string name="useExternalPlayerTitle">Gebruik externe speler</string>
+    <string name="downloadLocation">Downloadlocatie</string>
+    <string name="downloadLocationSummary">Locatie om gedownloadde videos in op te slaan.</string>
+    <string name="downloadLocationDialogTitle">Voer downloadlocatie is</string>
+    <string name="autoPlayThroughIntentTitle">Speel automatisch via Intent</string>
+    <string name="autoPlayThroughIntentSummary">Speel een video automatisch af indien geopend vanuit een andere app.</string>
+    <string name="defaultResolutionPreferenceTitle">Standaardresolutie</string>
+    <string name="playWithKodiTitle">Speel af met Kodi</string>
+    <string name="koreNotFound">Kore app niet gevonden. Kore is nodig om videos op Kodi af te spelen.</string>
+    <string name="installeKore">Installeer Kore</string>
+    <string name="showPlayWithKodiTitle">Toon \"Speel af met Kodi\" optie</string>
+    <string name="showPlayWithKodiSummary">Toont een optie om een video op een Kodi media center af te spelen.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Standaard audio formaat</string>
+    <string name="webMAudioDescription">Webam - open formaat</string>
+    <string name="m4aAudioDescription">m4a - betere kwaliteit</string>
+    <string name="downloadDialogTitle">Download</string>
+    <string name="nextVideoTitle">Volgende video</string>
+    <string name="urlNotSupportedText">URL wordt niet ondersteund.</string>
+    <string name="showSimilarVideosButtonText">Vergelijkbare videos</string>
+    <string name="showNextAndSimilarTitle">Laat volgende en vergelijkbare videos zien</string>
+    <string name="searchLanguageTitle">Voorkeurs content taal</string>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="noPlayerFound">Nie znaleziono odtwarzacza strumieniowego.</string>
+    <string name="installStreamPlayer">Zainstaluj</string>
+    <string name="cancel">Anuluj</string>
+    <string name="open_in_browser">Otwórz w przeglądarce</string>
+    <string name="share">Udostępnij</string>
+    <string name="download">Pobierz</string>
+    <string name="search">Szukaj</string>
+    <string name="settings">Ustawienia</string>
+    <string name="didYouMean">"Czy chodziło Ci o: "</string>
+    <string name="shareDialogTitle">Udostępnij za pośrednictwem:</string>
+    <string name="chooseBrowser">Wybierz przeglądarkę:</string>
+    <string name="screenRotation">obrót</string>
+    <string name="title_activity_settings">Ustawienia</string>
+    <string name="useExternalPlayerTitle">Użyj zewnętrznego odtwarzacza</string>
+    <string name="downloadLocation">Miejsce zapisu pobieranych plików</string>
+    <string name="downloadLocationSummary">Ścieżka folderu do zapisywania pobieranego wideo.</string>
+    <string name="downloadLocationDialogTitle">Wprowadź ścieżkę folderu dla pobieranych plików</string>
+    <string name="autoPlayThroughIntentTitle">Automatycznie odtwarzaj przez Intent</string>
+    <string name="autoPlayThroughIntentSummary">Automatycznie odtwarza wideo po wywołaniu z innej aplikacji.</string>
+    <string name="defaultResolutionPreferenceTitle">Domyślna rozdzielczość</string>
+    <string name="playWithKodiTitle">Odtwarzaj za pośrednictwem Kodi</string>
+    <string name="koreNotFound">Aplikacja Kore nie została znaleziona. Wymagana jest do odtwarzania w Kodi.</string>
+    <string name="installeKore">Zainstaluj Kore</string>
+    <string name="showPlayWithKodiTitle">Wyświetlaj opcję \"Odtwarzaj za pośrednictwem Kodi\"</string>
+    <string name="showPlayWithKodiSummary">Wyświetla opcję do odtwarzania wideo przez aplikację Kodi.</string>
+    <string name="playAudio">Dźwięk</string>
+    <string name="defaultAudioFormatTitle">Domyślny format dźwięku</string>
+    <string name="webMAudioDescription">WebM - otwarty format</string>
+    <string name="m4aAudioDescription">m4a - lepsza jakość</string>
+    <string name="downloadDialogTitle">Pobierz</string>
+    <string name="nextVideoTitle">Następne wideo</string>
+    <string name="showNextAndSimilarTitle">Wyświetl następne i podobne wideo</string>
+    <string name="urlNotSupportedText">Niewspierany URL.</string>
+    <string name="showSimilarVideosButtonText">Podobne wideo</string>
+    <string name="searchLanguageTitle">Preferowany język zawartości</string>
+    <string name="settingsCategoryVideoAudioTitle">WIDEO &amp; DŹWIĘK</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">INNE</string>
+<string name="searchPage">"Szukaj strony: "</string>
+    <string name="viewCountText">%1$s wyświetleń</string>
+    <string name="uploadDateText">Opublikowany %1$s</string>
+    <string name="itemThumbnailViewDescription">Miniaturka podglądowa wideo</string>
+    <string name="detailThumbnailViewDescription">Miniaturka podglądowa wideo</string>
+    <string name="detailUploaderThumbnailViewDescription">Miniaturka wysyłającego</string>
+    <string name="detailThumbsDownImgViewDescription">łapek w dół</string>
+    <string name="detailThumbsUpImgViewDescription">polubień</string>
+</resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="viewCountText">%1$s просмотров</string>
+    <string name="uploadDateText">Опубликовано %1$s</string>
+    <string name="noPlayerFound">Ни одного потокового проигрывателя не было найдено. Установить?</string>
+    <string name="installStreamPlayer">Установить</string>
+    <string name="cancel">Отмена</string>
+    <string name="open_in_browser">Открыть в браузере</string>
+    <string name="share">Поделиться</string>
+    <string name="download">Скачать</string>
+    <string name="search">Найти</string>
+    <string name="settings">Настройки</string>
+    <string name="didYouMean">Возможно, вы имели в виду: </string>
+    <string name="searchPage">Страница поиска: </string>
+    <string name="shareDialogTitle">Поделиться с помощью:</string>
+    <string name="chooseBrowser">Выбрать браузер:</string>
+    <string name="screenRotation">поворот</string>
+    <string name="title_activity_settings">Настройки</string>
+    <string name="useExternalPlayerTitle">Использовать внешний проигрыватель</string>
+    <string name="downloadLocation">Место для загрузок</string>
+    <string name="downloadLocationSummary">Папка для хранения загруженных файлов.</string>
+    <string name="downloadLocationDialogTitle">Введите путь к папке для загрузок</string>
+    <string name="autoPlayThroughIntentTitle">Автопроигрывание через интернет</string>
+    <string name="autoPlayThroughIntentSummary">Автоматически воспроизводить видео когда оно открыто через другое приложение.</string>
+    <string name="defaultResolutionPreferenceTitle">Разрешение по-умолчанию</string>
+    <string name="playWithKodiTitle">Воспроизвести с помощью Kodi</string>
+    <string name="koreNotFound">Приложение Kore не наидено. Чтобы проигрывать видео через Kodi media center, нужен Kore.</string>
+    <string name="installeKore">Установить Kore</string>
+    <string name="showPlayWithKodiTitle">Показывать опцию \"Воспроизвести с помощью Kodi\"</string>
+    <string name="showPlayWithKodiSummary">Показать опцию воспроизведения видео через Kodi media center.</string>
+    <string name="playAudio">Аудио</string>
+    <string name="defaultAudioFormatTitle">Формат аудио по-умолчанию</string>
+    <string name="webMAudioDescription">WebM - свободный формат</string>
+    <string name="m4aAudioDescription">m4a - лучшее качество</string>
+    <string name="downloadDialogTitle">Скачать</string>
+    <string-array name="downloadOptions">
+        <item>Видео</item>
+        <item>Аудио</item>
+    </string-array>
+    <string name="nextVideoTitle">Следующее видео</string>
+    <string name="urlNotSupportedText">URL не поддерживается.</string>
+    <string name="showSimilarVideosButtonText">Похожие видео</string>
+    <string name="showNextAndSimilarTitle">Показывать следующее и предложенные видео</string>
+    <string name="searchLanguageTitle">Предпочитаемый язык контента</string>
+<string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
+    <string name="settingsCategoryVideoInfoTittle">ИНФОРМАЦИЯ</string>
+    <string name="settingsCategoryEtcTitle">ПРОЧЕЕ</string>
+
+    <string name="itemThumbnailViewDescription">Миниатюра видео-превью</string>
+    <string name="detailThumbnailViewDescription">Миниатюра видео-превью</string>
+    <string name="detailUploaderThumbnailViewDescription">Миниатюра аватара пользователся</string>
+    <string name="detailThumbsDownImgViewDescription">Дислайки</string>
+    <string name="detailThumbsUpImgViewDescription">Лайки</string>
+</resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="viewCountText">%1$s приказа</string>
+    <string name="uploadDateText">"Отпремљен "%1$s</string>
+    <string name="noPlayerFound">Нема плејера токова. Можда желите да га инсталирате.</string>
+    <string name="installStreamPlayer">Инсталирај</string>
+    <string name="cancel">Одустани</string>
+    <string name="open_in_browser">Отвори у прегледачу</string>
+    <string name="share">Дели</string>
+    <string name="download">Преузми</string>
+    <string name="search">Тражи</string>
+    <string name="settings">Поставке</string>
+    <string name="didYouMean">Да ли сте мислили: </string>
+    <string name="searchPage">Страница претраге: </string>
+    <string name="shareDialogTitle">Подели помоћу:</string>
+    <string name="chooseBrowser">Отвори помоћу:</string>
+    <string name="screenRotation">ротација</string>
+    <string name="title_activity_settings">Поставке</string>
+    <string name="useExternalPlayerTitle">Користи спољашњи плејер</string>
+    <string name="downloadLocation">Одредиште преузимања</string>
+    <string name="downloadLocationSummary">Путања за упис преузетих видеа.</string>
+    <string name="downloadLocationDialogTitle">Унесите путању за преузимања</string>
+    <string name="autoPlayThroughIntentTitle">Аутопуштање преко Интента</string>
+    <string name="autoPlayThroughIntentSummary">Аутоматски почиње пушта видео по позиву из друге апликације.</string>
+    <string name="defaultResolutionPreferenceTitle">Подразумевана резолуција</string>
+    <string name="playWithKodiTitle">Пусти помоћу Кодија</string>
+    <string name="koreNotFound">Апликација Кор није нађена. Кор (Kore) је потребан да бисте пуштали видее у Коди медија центру.</string>
+    <string name="installeKore">Инсталирај Кор</string>
+    <string name="showPlayWithKodiTitle">Прикажи „Пусти помоћу Кодија“</string>
+    <string name="showPlayWithKodiSummary">Приказ опције за пуштање видеа у Коди медија центру.</string>
+    <string name="playAudio">Аудио</string>
+    <string name="defaultAudioFormatTitle">Подразумевани формат звука</string>
+    <string name="webMAudioDescription">WebM - слободни формат</string>
+    <string name="m4aAudioDescription">m4a - бољи квалитет</string>
+    <string name="downloadDialogTitle">Преузми</string>
+    <string-array name="downloadOptions">
+        <item>Видео</item>
+        <item>Аудио</item>
+    </string-array>
+    <string name="nextVideoTitle">Следећи видео</string>
+    <string name="urlNotSupportedText">УРЛ није подржан.</string>
+    <string name="showNextAndSimilarTitle">Прикажи следећи и слични видео</string>
+    <string name="showSimilarVideosButtonText">Слични видео</string>
+    <string name="searchLanguageTitle">Пожељни језик садржаја</string>
+<string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
+    <string name="settingsCategoryVideoInfoTittle">ПОДАЦИ</string>
+    <string name="settingsCategoryEtcTitle">ОСТАЛО</string>
+<string name="itemThumbnailViewDescription">Сличица видео прегледа</string>
+    <string name="detailThumbnailViewDescription">Сличица видео прегледа</string>
+    <string name="detailUploaderThumbnailViewDescription">Сличица отпремаоца</string>
+    <string name="detailThumbsDownImgViewDescription">Несвиђања</string>
+    <string name="detailThumbsUpImgViewDescription">Свиђања</string>
+</resources>
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">20sp</dimen>
+    <dimen name="video_item_detail_views_text_size">16sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">14sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">16sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">16sp</dimen>
+    <dimen name="video_item_detail_description_text_size">16sp</dimen>
+    <dimen name="video_item_detail_next_text_size">18sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">18sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">300dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
+    <dimen name="video_item_detail_like_image_height">18sp</dimen>
+    <dimen name="video_item_detail_like_image_width">18sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
+    <dimen name="video_item_detail_like_margin">10sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,37 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="android:colorPrimary">@color/primaryColorYoutube</item>
+        <item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+        <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
+    </style>
+
+    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
+    </style>
+
+    <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+    <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/dark_overlay</item>
+        <item name="background">@color/dark_overlay</item>
+    </style>
+</resources>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,12 +0,0 @@
-<resources>
-
-    <!-- Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels. -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="metaButtonBarStyle" format="reference" />
-        <attr name="metaButtonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="actionBarColorYoutube">#dd0000</color>
-    <color name="black_overlay">#66000000</color>
+    <color name="primaryColorYoutube">#cd322e</color>
+    <color name="primaryColorDarkYoutube">#bc211d</color>
+    <color name="accentColorYoutube">#000</color>
+    <color name="durationBackground">#a000</color>
+    <color name="durationText">#efff</color>
+    <color name="dark_overlay">#6000</color>
+    <color name="background_gray">#EEEEEE</color>
 </resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Search View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_search_title_text_size">14sp</dimen>
+    <dimen name="video_item_search_duration_text_size">11sp</dimen>
+    <dimen name="video_item_search_uploader_text_size">12sp</dimen>
+    <dimen name="video_item_search_upload_date_text_size">12sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
+    <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
+    <dimen name="video_item_search_card_padding">6dp</dimen>
+    <dimen name="video_item_search_image_right_margin">6dp</dimen>
+    <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
+    <dimen name="video_item_search_duration_horizontal_padding">5sp</dimen>
+    <dimen name="video_item_search_duration_margin">2sp</dimen>
+    <!-- Miscellaneous -->
+    <dimen name="video_item_search_card_radius">4dp</dimen>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">18sp</dimen>
+    <dimen name="video_item_detail_views_text_size">14sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">12sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">14sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">14sp</dimen>
+    <dimen name="video_item_detail_description_text_size">14sp</dimen>
+    <dimen name="video_item_detail_next_text_size">16sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">16sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">200dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">80dp</dimen>
+    <dimen name="video_item_detail_like_image_height">18sp</dimen>
+    <dimen name="video_item_detail_like_image_width">18sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">6sp</dimen>
+    <dimen name="video_item_detail_like_margin">6sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -1,5 +1,190 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Categories -->
+    <string name="settingsCategoryVideoAudio">settings_categoery_video_audio</string>
+    <string name="settingsCategoryVideoInfo">settings_category_video_info</string>
+    <string name="settingsCategoryEtc">settings_category_etc</string>
+    <!-- Key values -->
    <string name="downloadPathPreference">download_path_preference</string>
    <string name="useExternalPlayer">use_external_player</string>
+    <string name="autoPlayThroughIntent">autoplay_through_intent</string>
+    <string name="defaultResolutionPreference">default_resulution_preference</string>
+    <string-array name="resolutionList">
+        <item>720p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string name="defaultResolutionListItem">360p</string>
+    <string name="showPlayWidthKodiPreference">show_play_with_kodi_preference</string>
+    <string name="defaultAudioFormatPreference">default_audio_format</string>
+    <string-array name="audioFormatDescriptionList">
+        <item>@string/webMAudioDescription</item>
+        <item>@string/m4aAudioDescription</item>
+    </string-array>
+    <string-array name="audioFormatList">
+        <item>webm</item>
+        <item>m4a</item>
+    </string-array>
+    <string name="defaultAudioFormat">m4a</string>
+    <string name="showNextVideo">show_next_video</string>
+    <string name="searchLanguage">search_language</string>
+    <!-- TODO: scrape these programmatically, then store in a local cache -->
+    <!-- alternatively, load these from some local android data store -->
+    <string-array name='languageCodes'>
+        <item>af</item>
+        <item>az</item>
+        <item>id</item>
+        <item>ms</item>
+        <item>ca</item>
+        <item>cs</item>
+        <item>da</item>
+        <item>de</item>
+        <item>et</item>
+        <item>en-GB</item>
+        <item>en</item>
+        <item>es</item>
+        <item>es-419</item>
+        <item>eu</item>
+        <item>fil</item>
+        <item>fr</item>
+        <item>fr-CA</item>
+        <item>gl</item>
+        <item>hr</item>
+        <item>zu</item>
+        <item>is</item>
+        <item>it</item>
+        <item>sw</item>
+        <item>lv</item>
+        <item>lt</item>
+        <item>hu</item>
+        <item>nl</item>
+        <item>no</item>
+        <item>uz</item>
+        <item>pl</item>
+        <item>pt-PT</item>
+        <item>pt</item>
+        <item>ro</item>
+        <item>sq</item>
+        <item>sk</item>
+        <item>sl</item>
+        <item>fi</item>
+        <item>sv</item>
+        <item>vi</item>
+        <item>tr</item>
+        <item>bg</item>
+        <item>ky</item>
+        <item>kk</item>
+        <item>mk</item>
+        <item>mn</item>
+        <item>ru</item>
+        <item>sr</item>
+        <item>uk</item>
+        <item>el</item>
+        <item>hy</item>
+        <item>iw</item>
+        <item>ur</item>
+        <item>ar</item>
+        <item>fa</item>
+        <item>ne</item>
+        <item>mr</item>
+        <item>hi</item>
+        <item>bn</item>
+        <item>pa</item>
+        <item>gu</item>
+        <item>ta</item>
+        <item>te</item>
+        <item>kn</item>
+        <item>ml</item>
+        <item>si</item>
+        <item>th</item>
+        <item>lo</item>
+        <item>my</item>
+        <item>ka</item>
+        <item>am</item>
+        <item>km</item>
+        <item>zh-CN</item>
+        <item>zh-TW</item>
+        <item>zh-HK</item>
+        <item>ja</item>
+        <item>ko</item>
+    </string-array>
+    <string-array name='languageNames'>
+        <item>Afrikaans</item>
+        <item>Azərbaycan</item>
+        <item>Bahasa Indonesia</item>
+        <item>Bahasa Malaysia</item>
+        <item>Català</item>
+        <item>Čeština</item>
+        <item>Dansk</item>
+        <item>Deutsch</item>
+        <item>Eesti</item>
+        <item>English (UK)</item>
+        <item>English (US)</item>
+        <item>Español (España)</item>
+        <item>Español (Latinoamérica)</item>
+        <item>Euskara</item>
+        <item>Filipino</item>
+        <item>Français</item>
+        <item>Français (Canada)</item>
+        <item>Galego</item>
+        <item>Hrvatski</item>
+        <item>IsiZulu</item>
+        <item>Íslenska</item>
+        <item>Italiano</item>
+        <item>Kiswahili</item>
+        <item>Latviešu valoda</item>
+        <item>Lietuvių</item>
+        <item>Magyar</item>
+        <item>Nederlands</item>
+        <item>Norsk</item>
+        <item>O‘zbek</item>
+        <item>Polski</item>
+        <item>Português</item>
+        <item>Português (Brasil)</item>
+        <item>Română</item>
+        <item>Shqip</item>
+        <item>Slovenčina</item>
+        <item>Slovenščina</item>
+        <item>Suomi</item>
+        <item>Svenska</item>
+        <item>Tiếng Việt</item>
+        <item>Türkçe</item>
+        <item>Български</item>
+        <item>Кыргызча</item>
+        <item>Қазақ Тілі</item>
+        <item>Македонски</item>
+        <item>Монгол</item>
+        <item>Русский</item>
+        <item>Српски</item>
+        <item>Українська</item>
+        <item>Ελληνικά</item>
+        <item>Հայերեն</item>
+        <item>עברית</item>
+        <item>اردو</item>
+        <item>العربية</item>
+        <item>فارسی</item>
+        <item>नेपाली</item>
+        <item>मराठी</item>
+        <item>हिन्दी</item>
+        <item>বাংলা</item>
+        <item>ਪੰਜਾਬੀ</item>
+        <item>ગુજરાતી</item>
+        <item>தமிழ்</item>
+        <item>తెలుగు</item>
+        <item>ಕನ್ನಡ</item>
+        <item>മലയാളം</item>
+        <item>සිංහල</item>
+        <item>ภาษาไทย</item>
+        <item>ລາວ</item>
+        <item>ဗမာ</item>
+        <item>ქართული</item>
+        <item>አማርኛ</item>
+        <item>ខ្មែរ</item>
+        <item>中文 (简体)</item>
+        <item>中文 (繁體)</item>
+        <item>中文 (香港)</item>
+        <item>日本語</item>
+        <item>한국어</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,20 +1,18 @@
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">NewPipe</string>
-    <string name="title_videoitem_detail">NewPipe</string>
-    <string name="nothingFound">Noting found</string>
-    <string name="viewSufix">views</string>
-    <string name="uploadDatePrefix">Uploaded at: </string>
-    <string name="noPlayerFound">No StreamPlayer found. You may want to install one.</string>
-    <string name="installStreamPlayer">Install one</string>
+    <string name="app_name" translatable="false">NewPipe</string>
+    <string name="title_videoitem_detail" translatable="false">NewPipe</string>
+    <string name="viewCountText">%1$s views</string>
+    <string name="uploadDateText">Uploaded on %1$s</string>
+    <string name="noPlayerFound">No stream player found. You may want to install one.</string>
+    <string name="installStreamPlayer">Install</string>
    <string name="cancel">Cancel</string>
-    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="fdroidVLCurl" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
    <string name="open_in_browser">Open in browser</string>
    <string name="share">Share</string>
-    <string name="play">Play</string>
    <string name="download">Download</string>
    <string name="search">Search</string>
    <string name="settings">Settings</string>
-    <string name="sendWith">Send with</string>
    <string name="didYouMean">Did you mean: </string>
    <string name="searchPage">Search page: </string>
    <string name="shareDialogTitle">Share with:</string>
@@ -25,4 +23,37 @@
    <string name="downloadLocation">Download location</string>
    <string name="downloadLocationSummary">Path to store downloaded videos in.</string>
    <string name="downloadLocationDialogTitle">Enter download path</string>
+    <string name="autoPlayThroughIntentTitle">Autoplay through Intent</string>
+    <string name="autoPlayThroughIntentSummary">Automatically starts a video when it was called from another app.</string>
+    <string name="defaultResolutionPreferenceTitle">Default Resolution</string>
+    <string name="playWithKodiTitle">Play with Kodi</string>
+    <string name="koreNotFound">Kore app not found. Kore is needed to play videos with Kodi media center.</string>
+    <string name="installeKore">Install Kore</string>
+    <string name="fdroidKoreUrl" translatable="false">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Show \"Play with Kodi\" option</string>
+    <string name="showPlayWithKodiSummary">Displays an option to play a video via Kodi media center.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Default audio format</string>
+    <string name="webMAudioDescription">WebM - free format</string>
+    <string name="m4aAudioDescription">m4a - better quality</string>
+    <string name="downloadDialogTitle">Download</string>
+    <string-array name="downloadOptions">
+        <item>Video</item>
+        <item>Audio</item>
+    </string-array>
+    <string name="nextVideoTitle">Next video</string>
+    <string name="showNextAndSimilarTitle">Show next and similar videos</string>
+    <string name="urlNotSupportedText">URL not supported.</string>
+    <string name="showSimilarVideosButtonText">Similar videos</string>
+    <string name="searchLanguageTitle">Preferable content language</string>
+    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">ETC</string>
+
+    <!-- Content descriptions (for better accessibility) -->
+    <string name="itemThumbnailViewDescription">Video preview thumbnail</string>
+    <string name="detailThumbnailViewDescription">Video preview thumbnail</string>
+    <string name="detailUploaderThumbnailViewDescription">Uploader thumbnail</string>
+    <string name="detailThumbsDownImgViewDescription">Dislikes</string>
+    <string name="detailThumbsUpImgViewDescription">Likes</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,30 +1,35 @@
 <resources>
-
    <!-- Base application theme. -->
    <style name="AppTheme" parent="Theme.AppCompat.Light">
        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/primaryColorYoutube</item>
+        <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+        <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
    </style>

    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
        <item name="android:displayOptions">showHome</item>
        <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/actionBarColorYoutube</item>
-        <item name="background">@color/actionBarColorYoutube</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
    </style>

-    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
        <item name="android:windowFullscreen">false</item>
        <item name="android:windowActionBarOverlay">true</item>
        <item name="windowActionBarOverlay">true</item>
-        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
-        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:windowBackground">@android:color/black</item>
    </style>

-    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+    <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
        <item name="android:displayOptions">showHome</item>
        <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/black_overlay</item>
-        <item name="background">@color/black_overlay</item>
+        <item name="android:background">@color/dark_overlay</item>
+        <item name="background">@color/dark_overlay</item>
    </style>
-</resources>
+</resources>
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -3,15 +3,70 @@
    android:title="@string/title_activity_settings"
    android:key="general_preferences">

-    <CheckBoxPreference
-        android:key="@string/useExternalPlayer"
-        android:title="@string/useExternalPlayerTitle"/>
+    <PreferenceCategory
+        android:key="@string/settingsCategoryVideoAudio"
+        android:title="@string/settingsCategoryVideoAudioTitle">

-    <EditTextPreference
-        android:key="@string/downloadPathPreference"
-        android:title="@string/downloadLocation"
-        android:summary="@string/downloadLocationSummary"
-        android:dialogTitle="@string/downloadLocationDialogTitle"
-        android:defaultValue=""/>
+        <CheckBoxPreference
+            android:key="@string/useExternalPlayer"
+            android:title="@string/useExternalPlayerTitle"
+            android:defaultValue="false"/>

+        <ListPreference
+            android:key="@string/defaultResolutionPreference"
+            android:title="@string/defaultResolutionPreferenceTitle"
+            android:entries="@array/resolutionList"
+            android:entryValues="@array/resolutionList"
+            android:defaultValue="@string/defaultResolutionListItem"/>
+
+        <ListPreference
+            android:key="@string/defaultAudioFormatPreference"
+            android:title="@string/defaultAudioFormatTitle"
+            android:entries="@array/audioFormatDescriptionList"
+            android:entryValues="@array/audioFormatList"
+            android:defaultValue="@string/defaultAudioFormat"/>
+
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="@string/settingsCategoryVideoInfo"
+        android:title="@string/settingsCategoryVideoInfoTittle">
+
+        <CheckBoxPreference
+            android:key="@string/showPlayWidthKodiPreference"
+            android:title="@string/showPlayWithKodiTitle"
+            android:summary="@string/showPlayWithKodiSummary"
+            android:defaultValue="false" />
+
+        <ListPreference
+            android:key="@string/searchLanguage"
+            android:title="@string/searchLanguageTitle"
+            android:entries="@array/languageNames"
+            android:entryValues="@array/languageCodes"
+            android:defaultValue="en" />
+
+        <CheckBoxPreference
+            android:key="@string/showNextVideo"
+            android:title="@string/showNextAndSimilarTitle"
+            android:defaultValue="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="@string/settingsCategoryEtc"
+        android:title="@string/settingsCategoryEtcTitle">
+
+        <EditTextPreference
+            android:key="@string/downloadPathPreference"
+            android:title="@string/downloadLocation"
+            android:summary="@string/downloadLocationSummary"
+            android:dialogTitle="@string/downloadLocationDialogTitle"
+            android:defaultValue=""/>
+
+        <CheckBoxPreference
+            android:key="@string/autoPlayThroughIntent"
+            android:title="@string/autoPlayThroughIntentTitle"
+            android:summary="@string/autoPlayThroughIntentSummary"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
 </PreferenceScreen>
--- a/assets/AndroidIcons.zip
+++ b/assets/AndroidIcons.zip
--- a/Show More
+++ b/Show More