641 files changed, 168 insertions, 269 deletions

diff --git a/.gitmodules b/.gitmodules
index 17dac28b0..2529169ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "submodules/dslv"]
 	path = submodules/dslv
 	url = git://github.com/danieloeh/drag-sort-listview.git
+[submodule "app/dslv"]
+	path = app/dslv
+	url = https://github.com/danieloeh/drag-sort-listview.git
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 000000000..1295a81dc
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,112 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12.2'
+    }
+}
+apply plugin: 'com.android.application'
+
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:appcompat-v7:20.0.0'
+    compile 'org.apache.commons:commons-lang3:3.3.2'
+    compile ('org.shredzone.flattr4j:flattr4j-core:2.10') {
+        exclude group: 'org.apache.httpcomponents', module: 'httpcore'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+        exclude group: 'org.json', module: 'json'
+    }
+    compile 'commons-io:commons-io:2.4'
+    compile 'com.nineoldandroids:library:2.4.0'
+    compile project('dslv:library')
+
+    compile 'com.jayway.android.robotium:robotium-solo:5.2.1'
+    compile ("com.doomonafireball.betterpickers:library:1.5.2") {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+    compile 'org.jsoup:jsoup:1.7.3'
+    compile 'com.squareup.picasso:picasso:2.3.4'
+    compile 'com.squareup.okhttp:okhttp:2.0.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'
+    compile 'com.squareup.okio:okio:1.0.0'
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "20.0"
+
+    defaultConfig {
+        minSdkVersion 10
+        targetSdkVersion 19
+        testApplicationId "de.test.antennapod"
+        testInstrumentationRunner "de.test.antennapod.AntennaPodTestRunner"
+    }
+
+    signingConfigs {
+        releaseConfig {
+            if (project.hasProperty('releaseStoreFile')) {
+                storeFile file(releaseStoreFile)
+            } else {
+                storeFile file('keystore')
+            }
+            if (project.hasProperty('releaseStorePassword')) {
+                storePassword releaseStorePassword
+            } else {
+                storePassword "password"
+            }
+            if (project.hasProperty('releaseKeyAlias')) {
+                keyAlias releaseKeyAlias
+            } else {
+                keyAlias "alias"
+            }
+            if (project.hasProperty('releaseKeyPassword')) {
+                keyPassword releaseKeyPassword
+            } else {
+                keyPassword "password"
+            }
+        }
+    }
+
+    buildTypes {
+        def STRING = "String"
+        def FLATTR_APP_KEY = "FLATTR_APP_KEY"
+        def FLATTR_APP_SECRET = "FLATTR_APP_SECRET"
+        def mFlattrAppKey = (project.hasProperty('flattrAppKey')) ? flattrAppKey : "\"\""
+        def mFlattrAppSecret = (project.hasProperty('flattrAppSecret')) ? flattrAppSecret : "\"\""
+
+        debug {
+            applicationIdSuffix ".debug"
+            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
+            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
+        }
+        release {
+            runProguard true
+            proguardFile 'proguard.cfg'
+            signingConfig signingConfigs.releaseConfig
+            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
+            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.12'
+}
diff --git a/app/dslv b/app/dslv
new file mode 160000
+Subproject 80011c50e444e1c7d5e13b57bdb127b524a1ff9
diff --git a/lint.xml b/app/lint.xml
index 0d4eb14d3..0d4eb14d3 100644
--- a/lint.xml
+++ b/app/lint.xml
diff --git a/proguard.cfg b/app/proguard.cfg
index 1838f007c..1838f007c 100644
--- a/proguard.cfg
+++ b/app/proguard.cfg
diff --git a/app/settings.gradle b/app/settings.gradle
new file mode 100644
index 000000000..e2d4f844d
--- /dev/null
+++ b/app/settings.gradle
@@ -0,0 +1 @@
+include ':app:dslv:library'
diff --git a/src/instrumentationTest/de/test/antennapod/AntennaPodTestRunner.java b/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java
index cc8494632..24cd6e669 100644
--- a/src/instrumentationTest/de/test/antennapod/AntennaPodTestRunner.java
+++ b/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod;
+package de.test.antennapod;
 
 import android.test.InstrumentationTestRunner;
 import android.test.suitebuilder.TestSuiteBuilder;
@@ -10,7 +10,7 @@ public class AntennaPodTestRunner extends InstrumentationTestRunner {
     public TestSuite getAllTests() {
         return new TestSuiteBuilder(AntennaPodTestRunner.class)
                 .includeAllPackagesUnderHere()
-                .excludePackages("instrumentationTest.de.test.antennapod.gpodnet")
+                .excludePackages("de.test.antennapod.gpodnet")
                 .build();
     }
 }
diff --git a/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
index a96fc7aab..971a79a81 100644
--- a/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java
@@ -1,7 +1,7 @@
-package instrumentationTest.de.test.antennapod.gpodnet;
+package de.test.antennapod.gpodnet;
 
 import android.test.AndroidTestCase;
-import android.util.Log;
+
 import de.danoeh.antennapod.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;
diff --git a/src/instrumentationTest/de/test/antennapod/syndication/handler/FeedHandlerTest.java b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
index 213dac66a..3fe42dfd0 100644
--- a/src/instrumentationTest/de/test/antennapod/syndication/handler/FeedHandlerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java
@@ -1,13 +1,13 @@
-package instrumentationTest.de.test.antennapod.syndication.handler;
+package de.test.antennapod.handler;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.feed.*;
 import de.danoeh.antennapod.syndication.handler.FeedHandler;
 import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.AtomGenerator;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.FeedGenerator;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
+import de.test.antennapod.util.syndication.feedgenerator.AtomGenerator;
+import de.test.antennapod.util.syndication.feedgenerator.FeedGenerator;
+import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
index 6e44c8a0f..575bbb998 100644
--- a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.download;
+package de.test.antennapod.service.download;
 
 import android.test.InstrumentationTestCase;
 import android.util.Log;
@@ -8,7 +8,7 @@ import de.danoeh.antennapod.service.download.DownloadStatus;
 import de.danoeh.antennapod.service.download.Downloader;
 import de.danoeh.antennapod.service.download.HttpDownloader;
 import de.danoeh.antennapod.util.DownloadError;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.service.download.HTTPBin;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
index 71747dae8..b7d30a7b8 100644
--- a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.playback;
+package de.test.antennapod.service.playback;
 
 import android.content.Context;
 import android.media.RemoteControlClient;
@@ -10,7 +10,7 @@ import de.danoeh.antennapod.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.service.playback.PlayerStatus;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 import de.danoeh.antennapod.util.playback.Playable;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.service.download.HTTPBin;
 import junit.framework.AssertionFailedError;
 import org.apache.commons.io.IOUtils;
 
@@ -69,7 +69,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
         assertTrue(cacheDir.canWrite());
         assertTrue(cacheDir.canRead());
         if (!dest.exists()) {
-            InputStream i = getInstrumentation().getTargetContext().getAssets().open("testfile.mp3");
+            InputStream i = getInstrumentation().getContext().getAssets().open("testfile.mp3");
             OutputStream o = new FileOutputStream(new File(cacheDir, PLAYABLE_DEST_URL));
             IOUtils.copy(i, o);
             o.flush();
diff --git a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
index 19f64b4cf..86f609d74 100644
--- a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.playback;
+package de.test.antennapod.service.playback;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
index c42c7a0cc..fe337a5fb 100644
--- a/src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
@@ -9,14 +9,14 @@ import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.storage.FeedItemStatistics;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.*;
+import static de.test.antennapod.storage.DBTestUtils.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.saveFeedlist;
+import static de.test.antennapod.storage.DBTestUtils.saveFeedlist;
 
 /**
  * Test class for DBReader
diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
index 1e5afd0e3..8859e50f9 100644
--- a/src/instrumentationTest/de/test/antennapod/storage/DBTasksTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.*;
+import static de.test.antennapod.storage.DBTestUtils.*;
 
 /**
  * Test class for DBTasks
diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
index 7e9e1b908..947984574 100644
--- a/src/instrumentationTest/de/test/antennapod/storage/DBTestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import de.danoeh.antennapod.feed.Feed;
diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
index 67d99f9fc..c1e045b79 100644
--- a/src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/instrumentationTest/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index 23fc224c8..9b98c5f89 100644
--- a/src/instrumentationTest/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -1,8 +1,7 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import com.robotium.solo.Solo;
@@ -10,7 +9,6 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 
diff --git a/src/instrumentationTest/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
index 98d93a35d..28271a52b 100644
--- a/src/instrumentationTest/de/test/antennapod/ui/PlaybackTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/src/instrumentationTest/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index 8877d46d6..eac90e7c1 100644
--- a/src/instrumentationTest/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -7,10 +7,9 @@ import android.os.Build;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.storage.DBWriter;
 import de.danoeh.antennapod.storage.PodDBAdapter;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
+import de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 import junit.framework.Assert;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
diff --git a/src/instrumentationTest/de/test/antennapod/ui/UITestUtilsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
index 88180152c..e7782ff59 100644
--- a/src/instrumentationTest/de/test/antennapod/ui/UITestUtilsTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.feed.Feed;
diff --git a/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/VideoplayerActivityTest.java
index 807552571..da6f07cab 100644
--- a/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/VideoplayerActivityTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.test.ActivityInstrumentationTestCase2;
 
diff --git a/src/instrumentationTest/de/test/antennapod/util/ConverterTest.java b/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java
index 8e5674b06..9ab444a99 100644
--- a/src/instrumentationTest/de/test/antennapod/util/ConverterTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 
diff --git a/src/instrumentationTest/de/test/antennapod/util/FilenameGeneratorTest.java b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
index 552d34941..bf7f57459 100644
--- a/src/instrumentationTest/de/test/antennapod/util/FilenameGeneratorTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/instrumentationTest/de/test/antennapod/util/URIUtilTest.java b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
index a7cba4c03..61d230295 100644
--- a/src/instrumentationTest/de/test/antennapod/util/URIUtilTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 import de.danoeh.antennapod.util.URIUtil;
diff --git a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
index 08fd0d486..fd485e0da 100644
--- a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 import de.danoeh.antennapod.util.URLChecker;
diff --git a/src/instrumentationTest/de/test/antennapod/util/playback/TimelineTest.java b/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java
index 1b1d011d4..c2b7ad316 100644
--- a/src/instrumentationTest/de/test/antennapod/util/playback/TimelineTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.playback;
+package de.test.antennapod.util.playback;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
diff --git a/src/instrumentationTest/de/test/antennapod/util/service/download/HTTPBin.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
index fc5025b14..5cb723446 100644
--- a/src/instrumentationTest/de/test/antennapod/util/service/download/HTTPBin.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.service.download;
+package de.test.antennapod.util.service.download;
 
 import android.util.Base64;
 import android.util.Log;
diff --git a/src/instrumentationTest/de/test/antennapod/util/service/download/NanoHTTPD.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java
index 916a2af6c..4a5818479 100644
--- a/src/instrumentationTest/de/test/antennapod/util/service/download/NanoHTTPD.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.service.download;
+package de.test.antennapod.util.service.download;
 
 import java.io.*;
 import java.net.InetAddress;
diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/FeedDiscovererTest.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
index 51a28089d..10414fd2a 100644
--- a/src/instrumentationTest/de/test/antennapod/util/syndication/FeedDiscovererTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication;
+package de.test.antennapod.util.syndication;
 
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.util.syndication.FeedDiscoverer;
diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
index 0e3440030..8ce6c08e4 100644
--- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
 import de.danoeh.antennapod.feed.Feed;
diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
index e6b0f0697..23518de87 100644
--- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import de.danoeh.antennapod.feed.Feed;
 
diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
index d8bef2354..e7cbb1b42 100644
--- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import org.xmlpull.v1.XmlSerializer;
 
diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
index 824a84a66..6355d4bb9 100644
--- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java
@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
 import de.danoeh.antennapod.feed.Feed;
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65eac99ea..65eac99ea 100644
--- a/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
diff --git a/src/com/aocate/presto/service/IDeathCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IDeathCallback_0_8.aidl
index 6bdc76801..6bdc76801 100644
--- a/src/com/aocate/presto/service/IDeathCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IDeathCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl
index 7357e402e..7357e402e 100644
--- a/src/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl
index d5edea729..d5edea729 100644
--- a/src/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl
index 2c4f2df3e..2c4f2df3e 100644
--- a/src/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl
index 9dbd1d260..9dbd1d260 100644
--- a/src/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl
index 41223a97b..41223a97b 100644
--- a/src/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl
index 7be8f1237..7be8f1237 100644
--- a/src/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl
index 5bdda98b6..5bdda98b6 100644
--- a/src/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl
index a69c1cf34..a69c1cf34 100644
--- a/src/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl
diff --git a/src/com/aocate/presto/service/IPlayMedia_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IPlayMedia_0_8.aidl
index 12a6047de..12a6047de 100644
--- a/src/com/aocate/presto/service/IPlayMedia_0_8.aidl
+++ b/app/src/main/aidl/com/aocate/presto/service/IPlayMedia_0_8.aidl
diff --git a/assets/LICENSE.html b/app/src/main/assets/LICENSE.html
index d38547791..d38547791 100644
--- a/assets/LICENSE.html
+++ b/app/src/main/assets/LICENSE.html
diff --git a/assets/LICENSE_APACHE_COMMONS.txt b/app/src/main/assets/LICENSE_APACHE_COMMONS.txt
index d64569567..d64569567 100644
--- a/assets/LICENSE_APACHE_COMMONS.txt
+++ b/app/src/main/assets/LICENSE_APACHE_COMMONS.txt
diff --git a/assets/LICENSE_BETTERPICKERS.txt b/app/src/main/assets/LICENSE_BETTERPICKERS.txt
index 80830ed73..80830ed73 100644
--- a/assets/LICENSE_BETTERPICKERS.txt
+++ b/app/src/main/assets/LICENSE_BETTERPICKERS.txt
diff --git a/assets/LICENSE_DSLV.txt b/app/src/main/assets/LICENSE_DSLV.txt
index 2a2de04a3..2a2de04a3 100644
--- a/assets/LICENSE_DSLV.txt
+++ b/app/src/main/assets/LICENSE_DSLV.txt
diff --git a/assets/LICENSE_FLATTR4J.txt b/app/src/main/assets/LICENSE_FLATTR4J.txt
index d64569567..d64569567 100644
--- a/assets/LICENSE_FLATTR4J.txt
+++ b/app/src/main/assets/LICENSE_FLATTR4J.txt
diff --git a/assets/LICENSE_JSOUP.txt b/app/src/main/assets/LICENSE_JSOUP.txt
index f3ef71dbf..f3ef71dbf 100644
--- a/assets/LICENSE_JSOUP.txt
+++ b/app/src/main/assets/LICENSE_JSOUP.txt
diff --git a/assets/LICENSE_NINE_OLD_ANDROIDS.txt b/app/src/main/assets/LICENSE_NINE_OLD_ANDROIDS.txt
index d64569567..d64569567 100644
--- a/assets/LICENSE_NINE_OLD_ANDROIDS.txt
+++ b/app/src/main/assets/LICENSE_NINE_OLD_ANDROIDS.txt
diff --git a/assets/LICENSE_OKHTTP.txt b/app/src/main/assets/LICENSE_OKHTTP.txt
index 90edcee40..90edcee40 100644
--- a/assets/LICENSE_OKHTTP.txt
+++ b/app/src/main/assets/LICENSE_OKHTTP.txt
diff --git a/assets/LICENSE_OKIO.txt b/app/src/main/assets/LICENSE_OKIO.txt
index d64569567..d64569567 100644
--- a/assets/LICENSE_OKIO.txt
+++ b/app/src/main/assets/LICENSE_OKIO.txt
diff --git a/assets/LICENSE_PICASSO.txt b/app/src/main/assets/LICENSE_PICASSO.txt
index 0bf6b9f8e..0bf6b9f8e 100644
--- a/assets/LICENSE_PICASSO.txt
+++ b/app/src/main/assets/LICENSE_PICASSO.txt
diff --git a/assets/LICENSE_PRESTO.txt b/app/src/main/assets/LICENSE_PRESTO.txt
index b4b1a8cf5..b4b1a8cf5 100644
--- a/assets/LICENSE_PRESTO.txt
+++ b/app/src/main/assets/LICENSE_PRESTO.txt
diff --git a/assets/Roboto-Light.ttf b/app/src/main/assets/Roboto-Light.ttf
index 13bf13af0..13bf13af0 100644
--- a/assets/Roboto-Light.ttf
+++ b/app/src/main/assets/Roboto-Light.ttf
diff --git a/assets/Roboto.ttf b/app/src/main/assets/Roboto.ttf
index 0ba95c98c..0ba95c98c 100644
--- a/assets/Roboto.ttf
+++ b/app/src/main/assets/Roboto.ttf
diff --git a/assets/about.html b/app/src/main/assets/about.html
index 8b8746add..8b8746add 100644
--- a/assets/about.html
+++ b/app/src/main/assets/about.html
diff --git a/assets/logo.png b/app/src/main/assets/logo.png
index d0e988a6d..d0e988a6d 100755
--- a/assets/logo.png
+++ b/app/src/main/assets/logo.png
diff --git a/assets/testfile.mp3 b/app/src/main/assets/testfile.mp3
index f15faadf3..f15faadf3 100644
--- a/assets/testfile.mp3
+++ b/app/src/main/assets/testfile.mp3
diff --git a/src/com/aocate/media/AndroidMediaPlayer.java b/app/src/main/java/com/aocate/media/AndroidMediaPlayer.java
index 17ee74a13..17ee74a13 100644
--- a/src/com/aocate/media/AndroidMediaPlayer.java
+++ b/app/src/main/java/com/aocate/media/AndroidMediaPlayer.java
diff --git a/src/com/aocate/media/MediaPlayer.java b/app/src/main/java/com/aocate/media/MediaPlayer.java
index 04ecd58a9..04ecd58a9 100644
--- a/src/com/aocate/media/MediaPlayer.java
+++ b/app/src/main/java/com/aocate/media/MediaPlayer.java
diff --git a/src/com/aocate/media/MediaPlayerImpl.java b/app/src/main/java/com/aocate/media/MediaPlayerImpl.java
index 856ab47ce..856ab47ce 100644
--- a/src/com/aocate/media/MediaPlayerImpl.java
+++ b/app/src/main/java/com/aocate/media/MediaPlayerImpl.java
diff --git a/src/com/aocate/media/ServiceBackedMediaPlayer.java b/app/src/main/java/com/aocate/media/ServiceBackedMediaPlayer.java
index ef4572d33..ef4572d33 100644
--- a/src/com/aocate/media/ServiceBackedMediaPlayer.java
+++ b/app/src/main/java/com/aocate/media/ServiceBackedMediaPlayer.java
diff --git a/src/com/aocate/media/SpeedAdjustmentAlgorithm.java b/app/src/main/java/com/aocate/media/SpeedAdjustmentAlgorithm.java
index d337a0452..d337a0452 100644
--- a/src/com/aocate/media/SpeedAdjustmentAlgorithm.java
+++ b/app/src/main/java/com/aocate/media/SpeedAdjustmentAlgorithm.java
diff --git a/src/de/danoeh/antennapod/AppConfig.java b/app/src/main/java/de/danoeh/antennapod/AppConfig.java
index 7a75e3a18..7a75e3a18 100644
--- a/src/de/danoeh/antennapod/AppConfig.java
+++ b/app/src/main/java/de/danoeh/antennapod/AppConfig.java
diff --git a/src/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 74628f3d6..74628f3d6 100644
--- a/src/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
diff --git a/src/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index cf7de1709..cf7de1709 100644
--- a/src/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 18d27ddda..18d27ddda 100644
--- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
diff --git a/src/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
index a03fa7949..a03fa7949 100644
--- a/src/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
diff --git a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
index 06a11c775..06a11c775 100644
--- a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
diff --git a/src/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
index c5f25d813..c5f25d813 100644
--- a/src/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java
diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 5cf187eb6..5cf187eb6 100644
--- a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
diff --git a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index 8dde14d3b..8dde14d3b 100644
--- a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index b7014dab2..b7014dab2 100644
--- a/src/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 2e5372b60..2e5372b60 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 2c6d75cd8..2c6d75cd8 100644
--- a/src/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index e09941abf..e09941abf 100644
--- a/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
index d3fd3949c..d3fd3949c 100644
--- a/src/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
index 16e663fac..16e663fac 100644
--- a/src/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
index 94f100321..94f100321 100644
--- a/src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
diff --git a/src/de/danoeh/antennapod/activity/OpmlImportHolder.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
index ec53ed7b6..ec53ed7b6 100644
--- a/src/de/danoeh/antennapod/activity/OpmlImportHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index cd6731c02..cd6731c02 100644
--- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
diff --git a/src/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index d8a137eb9..d8a137eb9 100644
--- a/src/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
diff --git a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 81661a288..81661a288 100644
--- a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
diff --git a/src/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
index 6a60f65fe..6a60f65fe 100644
--- a/src/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java
diff --git a/src/de/danoeh/antennapod/adapter/ActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
index 30ad2d03f..30ad2d03f 100644
--- a/src/de/danoeh/antennapod/adapter/ActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java
diff --git a/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
index 1de071a73..1de071a73 100644
--- a/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
diff --git a/src/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
index f393fb7d7..f393fb7d7 100644
--- a/src/de/danoeh/antennapod/adapter/AdapterUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java
diff --git a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
index c12de6ebd..c12de6ebd 100644
--- a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index 0c4cbe685..0c4cbe685 100644
--- a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
diff --git a/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 2cc216227..2cc216227 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index ef5af67de..ef5af67de 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 658af9e4e..658af9e4e 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index 3f666eb8b..3f666eb8b 100644
--- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 357b5f8b4..357b5f8b4 100644
--- a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
index c2c2285ac..c2c2285ac 100644
--- a/src/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index ef8e8ce07..ef8e8ce07 100644
--- a/src/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
index 8abe49133..8abe49133 100644
--- a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
index ebe519592..ebe519592 100644
--- a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index 2314c2269..2314c2269 100644
--- a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java
diff --git a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index f2e78a57e..f2e78a57e 100644
--- a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
diff --git a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java b/app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java
index 21ae5291e..21ae5291e 100644
--- a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java
diff --git a/src/de/danoeh/antennapod/asynctask/FeedRemover.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java
index 0549a4255..0549a4255 100644
--- a/src/de/danoeh/antennapod/asynctask/FeedRemover.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 9210ac1d1..9210ac1d1 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java
index 04d349671..04d349671 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
index 0dcf832f7..0dcf832f7 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
diff --git a/src/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
index 4abb1a67d..4abb1a67d 100644
--- a/src/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
diff --git a/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
index 038b8dcc5..038b8dcc5 100644
--- a/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java
diff --git a/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
index 13534fa64..13534fa64 100644
--- a/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java
diff --git a/src/de/danoeh/antennapod/asynctask/PicassoImageResource.java b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java
index 26f9d9278..26f9d9278 100644
--- a/src/de/danoeh/antennapod/asynctask/PicassoImageResource.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java
diff --git a/src/de/danoeh/antennapod/asynctask/PicassoProvider.java b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java
index 849725630..849725630 100644
--- a/src/de/danoeh/antennapod/asynctask/PicassoProvider.java
+++ b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java
diff --git a/src/de/danoeh/antennapod/backup/OpmlBackupAgent.java b/app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java
index 56d1ca092..56d1ca092 100644
--- a/src/de/danoeh/antennapod/backup/OpmlBackupAgent.java
+++ b/app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java
diff --git a/src/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
index bdb2d68ba..bdb2d68ba 100644
--- a/src/de/danoeh/antennapod/dialog/AuthenticationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
index d1ed795dc..d1ed795dc 100644
--- a/src/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/ConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java
index df71fff77..df71fff77 100644
--- a/src/de/danoeh/antennapod/dialog/ConfirmationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
index e363a6911..e363a6911 100644
--- a/src/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java
diff --git a/src/de/danoeh/antennapod/dialog/FeedItemDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
index 7384463de..7384463de 100644
--- a/src/de/danoeh/antennapod/dialog/FeedItemDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
index a9c596d2e..a9c596d2e 100644
--- a/src/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/TimeDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java
index bbd514640..bbd514640 100644
--- a/src/de/danoeh/antennapod/dialog/TimeDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java
diff --git a/src/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index b009e76a7..b009e76a7 100644
--- a/src/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
diff --git a/src/de/danoeh/antennapod/feed/Chapter.java b/app/src/main/java/de/danoeh/antennapod/feed/Chapter.java
index d6151ee9f..d6151ee9f 100644
--- a/src/de/danoeh/antennapod/feed/Chapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/Chapter.java
diff --git a/src/de/danoeh/antennapod/feed/EventDistributor.java b/app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java
index 5fb72048e..5fb72048e 100644
--- a/src/de/danoeh/antennapod/feed/EventDistributor.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java
diff --git a/src/de/danoeh/antennapod/feed/Feed.java b/app/src/main/java/de/danoeh/antennapod/feed/Feed.java
index b5415c69c..b5415c69c 100644
--- a/src/de/danoeh/antennapod/feed/Feed.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/Feed.java
diff --git a/src/de/danoeh/antennapod/feed/FeedComponent.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java
index 48b243770..48b243770 100644
--- a/src/de/danoeh/antennapod/feed/FeedComponent.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java
diff --git a/src/de/danoeh/antennapod/feed/FeedFile.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java
index a05533ebc..a05533ebc 100644
--- a/src/de/danoeh/antennapod/feed/FeedFile.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java
diff --git a/src/de/danoeh/antennapod/feed/FeedImage.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java
index c588f5e71..c588f5e71 100644
--- a/src/de/danoeh/antennapod/feed/FeedImage.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java
diff --git a/src/de/danoeh/antennapod/feed/FeedItem.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java
index 78091ea33..78091ea33 100644
--- a/src/de/danoeh/antennapod/feed/FeedItem.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java
diff --git a/src/de/danoeh/antennapod/feed/FeedMedia.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java
index 9298ebe8a..9298ebe8a 100644
--- a/src/de/danoeh/antennapod/feed/FeedMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java
diff --git a/src/de/danoeh/antennapod/feed/FeedPreferences.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java
index 29bc5ef0c..29bc5ef0c 100644
--- a/src/de/danoeh/antennapod/feed/FeedPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java
diff --git a/src/de/danoeh/antennapod/feed/ID3Chapter.java b/app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java
index 6dde7854e..6dde7854e 100644
--- a/src/de/danoeh/antennapod/feed/ID3Chapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java
diff --git a/src/de/danoeh/antennapod/feed/MediaType.java b/app/src/main/java/de/danoeh/antennapod/feed/MediaType.java
index 324d0a221..324d0a221 100644
--- a/src/de/danoeh/antennapod/feed/MediaType.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/MediaType.java
diff --git a/src/de/danoeh/antennapod/feed/SearchResult.java b/app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java
index 1cba389ec..1cba389ec 100644
--- a/src/de/danoeh/antennapod/feed/SearchResult.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java
diff --git a/src/de/danoeh/antennapod/feed/SimpleChapter.java b/app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java
index 3dab1b74d..3dab1b74d 100644
--- a/src/de/danoeh/antennapod/feed/SimpleChapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java
diff --git a/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java b/app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java
index 59844ae1f..59844ae1f 100644
--- a/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java
diff --git a/src/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index f5ae5a777..f5ae5a777 100644
--- a/src/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 082fe93fc..082fe93fc 100644
--- a/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index ffce518bf..ffce518bf 100644
--- a/src/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index d81ba4b86..d81ba4b86 100644
--- a/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
index 5a71cb36b..5a71cb36b 100644
--- a/src/de/danoeh/antennapod/fragment/DownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 985673dd3..985673dd3 100644
--- a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 04c7fbf8e..04c7fbf8e 100644
--- a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 909774467..909774467 100644
--- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index fe995256b..fe995256b 100644
--- a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index 470186180..470186180 100644
--- a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 2f322f75b..2f322f75b 100644
--- a/src/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
index 89c30e34b..89c30e34b 100644
--- a/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
index b3ade4d70..b3ade4d70 100644
--- a/src/de/danoeh/antennapod/fragment/SearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
index ec8f69368..ec8f69368 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 1b4616207..1b4616207 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
index 5717a74e7..5717a74e7 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
index 801024787..801024787 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
index 45fe25580..45fe25580 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
index 204dda992..204dda992 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
index a7e1033df..a7e1033df 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java
index 038b2a367..038b2a367 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
index 3b0140826..3b0140826 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
index a32e9357b..a32e9357b 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
index bdb394454..bdb394454 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
index 86a2171fa..86a2171fa 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
index b002035c9..b002035c9 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
index a4617118d..a4617118d 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
index 80b84095e..80b84095e 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
index fee8c7d28..fee8c7d28 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
+++ b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java
diff --git a/src/de/danoeh/antennapod/opml/OpmlElement.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java
index 4cb563c04..4cb563c04 100644
--- a/src/de/danoeh/antennapod/opml/OpmlElement.java
+++ b/app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java
diff --git a/src/de/danoeh/antennapod/opml/OpmlReader.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java
index 19a980dee..19a980dee 100644
--- a/src/de/danoeh/antennapod/opml/OpmlReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java
diff --git a/src/de/danoeh/antennapod/opml/OpmlSymbols.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java
index 4b0b7316a..4b0b7316a 100644
--- a/src/de/danoeh/antennapod/opml/OpmlSymbols.java
+++ b/app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java
diff --git a/src/de/danoeh/antennapod/opml/OpmlWriter.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java
index 405a5e35a..405a5e35a 100644
--- a/src/de/danoeh/antennapod/opml/OpmlWriter.java
+++ b/app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java
diff --git a/src/de/danoeh/antennapod/preferences/GpodnetPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java
index bdfe297a6..bdfe297a6 100644
--- a/src/de/danoeh/antennapod/preferences/GpodnetPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java
diff --git a/src/de/danoeh/antennapod/preferences/PlaybackPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java
index 1d1ab052f..1d1ab052f 100644
--- a/src/de/danoeh/antennapod/preferences/PlaybackPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java
diff --git a/src/de/danoeh/antennapod/preferences/UserPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java
index 2020ddfae..2020ddfae 100644
--- a/src/de/danoeh/antennapod/preferences/UserPreferences.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java
diff --git a/src/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java
index a0539e276..a0539e276 100644
--- a/src/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java
diff --git a/src/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
index 4dcf0b6aa..4dcf0b6aa 100644
--- a/src/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
diff --git a/src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
index 3c283a30b..3c283a30b 100644
--- a/src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java
diff --git a/src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
index 1edebd275..1edebd275 100644
--- a/src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java
diff --git a/src/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index 9f8892181..9f8892181 100644
--- a/src/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
diff --git a/src/de/danoeh/antennapod/receiver/SPAReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
index b0430d170..b0430d170 100644
--- a/src/de/danoeh/antennapod/receiver/SPAReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
diff --git a/src/de/danoeh/antennapod/service/GpodnetSyncService.java b/app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java
index c8c9fc31e..c8c9fc31e 100644
--- a/src/de/danoeh/antennapod/service/GpodnetSyncService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java
diff --git a/src/de/danoeh/antennapod/service/download/APRedirectHandler.java b/app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java
index ddf8d605d..ddf8d605d 100644
--- a/src/de/danoeh/antennapod/service/download/APRedirectHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java
diff --git a/src/de/danoeh/antennapod/service/download/AntennapodHttpClient.java b/app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java
index be331ce9b..be331ce9b 100644
--- a/src/de/danoeh/antennapod/service/download/AntennapodHttpClient.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java
diff --git a/src/de/danoeh/antennapod/service/download/DownloadRequest.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java
index e803d30d4..e803d30d4 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadRequest.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java
diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java
index 63be91b57..63be91b57 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java
diff --git a/src/de/danoeh/antennapod/service/download/DownloadStatus.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java
index 1d76770bb..1d76770bb 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java
diff --git a/src/de/danoeh/antennapod/service/download/Downloader.java b/app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java
index 80cc5b3f8..80cc5b3f8 100644
--- a/src/de/danoeh/antennapod/service/download/Downloader.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java
diff --git a/src/de/danoeh/antennapod/service/download/DownloaderCallback.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java
index 08420e83a..08420e83a 100644
--- a/src/de/danoeh/antennapod/service/download/DownloaderCallback.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java
diff --git a/src/de/danoeh/antennapod/service/download/HttpDownloader.java b/app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java
index 7ae96dc07..7ae96dc07 100644
--- a/src/de/danoeh/antennapod/service/download/HttpDownloader.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java
diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java
index 59d7ddbb9..59d7ddbb9 100644
--- a/src/de/danoeh/antennapod/service/playback/PlaybackService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java
diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
index 49f20012d..49f20012d 100644
--- a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java
index 680ec2e2f..680ec2e2f 100644
--- a/src/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java
diff --git a/src/de/danoeh/antennapod/service/playback/PlayerStatus.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java
index 3d2b4ad39..3d2b4ad39 100644
--- a/src/de/danoeh/antennapod/service/playback/PlayerStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java
diff --git a/src/de/danoeh/antennapod/service/playback/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java
index 71bc40c2a..71bc40c2a 100644
--- a/src/de/danoeh/antennapod/service/playback/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java
diff --git a/src/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 75cbd8b5a..75cbd8b5a 100644
--- a/src/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
diff --git a/src/de/danoeh/antennapod/storage/DBReader.java b/app/src/main/java/de/danoeh/antennapod/storage/DBReader.java
index e49ea4f83..e49ea4f83 100644
--- a/src/de/danoeh/antennapod/storage/DBReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/DBReader.java
diff --git a/src/de/danoeh/antennapod/storage/DBTasks.java b/app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java
index a230ba797..a230ba797 100644
--- a/src/de/danoeh/antennapod/storage/DBTasks.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java
diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java
index 9916ac97f..9916ac97f 100644
--- a/src/de/danoeh/antennapod/storage/DBWriter.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java
diff --git a/src/de/danoeh/antennapod/storage/DownloadRequestException.java b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java
index 0ef766e58..0ef766e58 100644
--- a/src/de/danoeh/antennapod/storage/DownloadRequestException.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java
diff --git a/src/de/danoeh/antennapod/storage/DownloadRequester.java b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java
index d305c572b..d305c572b 100644
--- a/src/de/danoeh/antennapod/storage/DownloadRequester.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java
diff --git a/src/de/danoeh/antennapod/storage/FeedItemStatistics.java b/app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java
index 8cb040756..8cb040756 100644
--- a/src/de/danoeh/antennapod/storage/FeedItemStatistics.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java
diff --git a/src/de/danoeh/antennapod/storage/FeedSearcher.java b/app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java
index e7aa93f83..e7aa93f83 100644
--- a/src/de/danoeh/antennapod/storage/FeedSearcher.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java
diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java
index 671ac30d5..671ac30d5 100644
--- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/FeedHandler.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java
index aafa1c209..aafa1c209 100644
--- a/src/de/danoeh/antennapod/syndication/handler/FeedHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java
index 41aa29b52..41aa29b52 100644
--- a/src/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/HandlerState.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java
index 17f84724f..17f84724f 100644
--- a/src/de/danoeh/antennapod/syndication/handler/HandlerState.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java
index 15dc94d65..15dc94d65 100644
--- a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/TypeGetter.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java
index 2496e112a..2496e112a 100644
--- a/src/de/danoeh/antennapod/syndication/handler/TypeGetter.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java
diff --git a/src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
index 605dad2fb..605dad2fb 100644
--- a/src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSContent.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java
index 9ad3026be..9ad3026be 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/NSContent.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSITunes.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java
index d8cbe040b..d8cbe040b 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/NSITunes.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java
index cc23167c1..cc23167c1 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java
index 9572f87ae..9572f87ae 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java
index 3f983ee88..3f983ee88 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/Namespace.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java
index 910131feb..910131feb 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/Namespace.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/SyndElement.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java
index 187312c9e..187312c9e 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/SyndElement.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
index 86b80d2ed..86b80d2ed 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java
diff --git a/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
index 2c8e232ff..2c8e232ff 100644
--- a/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java
diff --git a/src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
index 3138f087a..3138f087a 100644
--- a/src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java
diff --git a/src/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java
index d0fa3a5fc..d0fa3a5fc 100644
--- a/src/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java
diff --git a/src/de/danoeh/antennapod/util/ChapterUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java
index 9e1c50674..9e1c50674 100644
--- a/src/de/danoeh/antennapod/util/ChapterUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java
diff --git a/src/de/danoeh/antennapod/util/Converter.java b/app/src/main/java/de/danoeh/antennapod/util/Converter.java
index f4c2b2f66..f4c2b2f66 100644
--- a/src/de/danoeh/antennapod/util/Converter.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/Converter.java
diff --git a/src/de/danoeh/antennapod/util/DownloadError.java b/app/src/main/java/de/danoeh/antennapod/util/DownloadError.java
index 1a64991a6..1a64991a6 100644
--- a/src/de/danoeh/antennapod/util/DownloadError.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/DownloadError.java
diff --git a/src/de/danoeh/antennapod/util/DuckType.java b/app/src/main/java/de/danoeh/antennapod/util/DuckType.java
index 163110418..163110418 100644
--- a/src/de/danoeh/antennapod/util/DuckType.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/DuckType.java
diff --git a/src/de/danoeh/antennapod/util/EpisodeFilter.java b/app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java
index 115913bca..115913bca 100644
--- a/src/de/danoeh/antennapod/util/EpisodeFilter.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java
diff --git a/src/de/danoeh/antennapod/util/FeedtitleComparator.java b/app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java
index 112b6678d..112b6678d 100644
--- a/src/de/danoeh/antennapod/util/FeedtitleComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java
diff --git a/src/de/danoeh/antennapod/util/FileNameGenerator.java b/app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java
index 702df62b8..702df62b8 100644
--- a/src/de/danoeh/antennapod/util/FileNameGenerator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java
diff --git a/src/de/danoeh/antennapod/util/InvalidFeedException.java b/app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java
index 50adae216..50adae216 100644
--- a/src/de/danoeh/antennapod/util/InvalidFeedException.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java
diff --git a/src/de/danoeh/antennapod/util/LangUtils.java b/app/src/main/java/de/danoeh/antennapod/util/LangUtils.java
index e6e1d8399..e6e1d8399 100644
--- a/src/de/danoeh/antennapod/util/LangUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/LangUtils.java
diff --git a/src/de/danoeh/antennapod/util/NetworkUtils.java b/app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java
index 0c8065e94..0c8065e94 100644
--- a/src/de/danoeh/antennapod/util/NetworkUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java
diff --git a/src/de/danoeh/antennapod/util/QueueAccess.java b/app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java
index 7a1c7fef2..7a1c7fef2 100644
--- a/src/de/danoeh/antennapod/util/QueueAccess.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java
diff --git a/src/de/danoeh/antennapod/util/ShareUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java
index 941fc62ae..941fc62ae 100644
--- a/src/de/danoeh/antennapod/util/ShareUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java
diff --git a/src/de/danoeh/antennapod/util/ShownotesProvider.java b/app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java
index 8345ca34d..8345ca34d 100644
--- a/src/de/danoeh/antennapod/util/ShownotesProvider.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java
diff --git a/src/de/danoeh/antennapod/util/StorageUtils.java b/app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java
index ff0bde280..ff0bde280 100644
--- a/src/de/danoeh/antennapod/util/StorageUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java
diff --git a/src/de/danoeh/antennapod/util/ThemeUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java
index 8e593f3fb..8e593f3fb 100644
--- a/src/de/danoeh/antennapod/util/ThemeUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java
diff --git a/src/de/danoeh/antennapod/util/URIUtil.java b/app/src/main/java/de/danoeh/antennapod/util/URIUtil.java
index 5af40d591..5af40d591 100644
--- a/src/de/danoeh/antennapod/util/URIUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/URIUtil.java
diff --git a/src/de/danoeh/antennapod/util/URLChecker.java b/app/src/main/java/de/danoeh/antennapod/util/URLChecker.java
index 9997daaf7..9997daaf7 100644
--- a/src/de/danoeh/antennapod/util/URLChecker.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/URLChecker.java
diff --git a/src/de/danoeh/antennapod/util/UndoBarController.java b/app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java
index 332cc22e0..332cc22e0 100644
--- a/src/de/danoeh/antennapod/util/UndoBarController.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java
diff --git a/src/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java
index bfc2fd057..bfc2fd057 100644
--- a/src/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java
diff --git a/src/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java
index 14b8f1194..14b8f1194 100644
--- a/src/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java
diff --git a/src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
index f92c23d05..f92c23d05 100644
--- a/src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java
diff --git a/src/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java
index 0147e0cdc..0147e0cdc 100644
--- a/src/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java
diff --git a/src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
index 02b084a01..02b084a01 100644
--- a/src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java
diff --git a/src/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java b/app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java
index 4586cea87..4586cea87 100644
--- a/src/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java
diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
index eda83b7aa..eda83b7aa 100644
--- a/src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java
diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrStatus.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java
index a1d6d3bc4..a1d6d3bc4 100644
--- a/src/de/danoeh/antennapod/util/flattr/FlattrStatus.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java
diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrThing.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java
index f17ef1d83..f17ef1d83 100644
--- a/src/de/danoeh/antennapod/util/flattr/FlattrThing.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java
diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrUtils.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java
index 3e2ea3132..3e2ea3132 100644
--- a/src/de/danoeh/antennapod/util/flattr/FlattrUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java
diff --git a/src/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java
index 296610871..296610871 100644
--- a/src/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java
diff --git a/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java b/app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
index b920559db..b920559db 100644
--- a/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java
index 257635129..257635129 100644
--- a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java
index 252d64107..252d64107 100644
--- a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
index c458540ee..c458540ee 100644
--- a/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
index df73393a5..df73393a5 100644
--- a/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/Header.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java
index 22d5b6376..22d5b6376 100644
--- a/src/de/danoeh/antennapod/util/id3reader/model/Header.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java
diff --git a/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
index ec99ef14e..ec99ef14e 100644
--- a/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index 2c7a7f074..2c7a7f074 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
index a3adec66d..a3adec66d 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
diff --git a/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
index 7aa04d24c..7aa04d24c 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
diff --git a/src/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java
index 9c611a452..9c611a452 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java
diff --git a/src/de/danoeh/antennapod/util/playback/AudioPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java
index bd49b0d18..bd49b0d18 100644
--- a/src/de/danoeh/antennapod/util/playback/AudioPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java
diff --git a/src/de/danoeh/antennapod/util/playback/ExternalMedia.java b/app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java
index 3f6e6ae0a..3f6e6ae0a 100644
--- a/src/de/danoeh/antennapod/util/playback/ExternalMedia.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java
diff --git a/src/de/danoeh/antennapod/util/playback/IPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java
index 2d4551b13..2d4551b13 100644
--- a/src/de/danoeh/antennapod/util/playback/IPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java
diff --git a/src/de/danoeh/antennapod/util/playback/MediaPlayerError.java b/app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java
index 23ead581f..23ead581f 100644
--- a/src/de/danoeh/antennapod/util/playback/MediaPlayerError.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java
diff --git a/src/de/danoeh/antennapod/util/playback/Playable.java b/app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java
index 004ae56bb..004ae56bb 100644
--- a/src/de/danoeh/antennapod/util/playback/Playable.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java
diff --git a/src/de/danoeh/antennapod/util/playback/PlaybackController.java b/app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java
index 64dbf4868..64dbf4868 100644
--- a/src/de/danoeh/antennapod/util/playback/PlaybackController.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java
diff --git a/src/de/danoeh/antennapod/util/playback/Timeline.java b/app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java
index ceed68183..ceed68183 100644
--- a/src/de/danoeh/antennapod/util/playback/Timeline.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java
diff --git a/src/de/danoeh/antennapod/util/playback/VideoPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java
index ea9c692ab..ea9c692ab 100644
--- a/src/de/danoeh/antennapod/util/playback/VideoPlayer.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java
diff --git a/src/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java b/app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java
index ac38ec876..ac38ec876 100644
--- a/src/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java
diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java
index 767034ed2..767034ed2 100644
--- a/src/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java
diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java
index b2f149ddd..b2f149ddd 100644
--- a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java
diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java
index 8c47393c9..8c47393c9 100644
--- a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java
diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java
index 718a4f30f..718a4f30f 100644
--- a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java
diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java
index 574373241..574373241 100644
--- a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java
+++ b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java
diff --git a/src/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index f930c912a..f930c912a 100644
--- a/src/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
diff --git a/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index d3567dc31..d3567dc31 100644
--- a/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
diff --git a/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
index ddf12d13f..ddf12d13f 100644
--- a/res/anim/fade_out.xml
+++ b/app/src/main/res/anim/fade_out.xml
diff --git a/res/drawable-hdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_antenna.png
index 37d73c734..37d73c734 100644
--- a/res/drawable-hdpi-v11/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-hdpi-v11/ic_stat_antenna.png
diff --git a/res/drawable-hdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png
index ad148cc6b..ad148cc6b 100755
--- a/res/drawable-hdpi-v11/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png
diff --git a/res/drawable-hdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync.png
index 90b39c958..90b39c958 100644
--- a/res/drawable-hdpi-v11/stat_notify_sync.png
+++ b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync.png
diff --git a/res/drawable-hdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync_error.png
index 074cdee27..074cdee27 100644
--- a/res/drawable-hdpi-v11/stat_notify_sync_error.png
+++ b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync_error.png
diff --git a/res/drawable-hdpi/action_about.png b/app/src/main/res/drawable-hdpi/action_about.png
index 8f39c428a..8f39c428a 100644
--- a/res/drawable-hdpi/action_about.png
+++ b/app/src/main/res/drawable-hdpi/action_about.png
diff --git a/res/drawable-hdpi/action_about_dark.png b/app/src/main/res/drawable-hdpi/action_about_dark.png
index 6eaf08aec..6eaf08aec 100755
--- a/res/drawable-hdpi/action_about_dark.png
+++ b/app/src/main/res/drawable-hdpi/action_about_dark.png
diff --git a/res/drawable-hdpi/action_search.png b/app/src/main/res/drawable-hdpi/action_search.png
index e6b704518..e6b704518 100644
--- a/res/drawable-hdpi/action_search.png
+++ b/app/src/main/res/drawable-hdpi/action_search.png
diff --git a/res/drawable-hdpi/action_search_dark.png b/app/src/main/res/drawable-hdpi/action_search_dark.png
index f12e005eb..f12e005eb 100755
--- a/res/drawable-hdpi/action_search_dark.png
+++ b/app/src/main/res/drawable-hdpi/action_search_dark.png
diff --git a/res/drawable-hdpi/action_settings.png b/app/src/main/res/drawable-hdpi/action_settings.png
index cc32e2d1d..cc32e2d1d 100644
--- a/res/drawable-hdpi/action_settings.png
+++ b/app/src/main/res/drawable-hdpi/action_settings.png
diff --git a/res/drawable-hdpi/action_settings_dark.png b/app/src/main/res/drawable-hdpi/action_settings_dark.png
index 3e4580e05..3e4580e05 100755
--- a/res/drawable-hdpi/action_settings_dark.png
+++ b/app/src/main/res/drawable-hdpi/action_settings_dark.png
diff --git a/res/drawable-hdpi/action_stream.png b/app/src/main/res/drawable-hdpi/action_stream.png
index 8fc7a7b1e..8fc7a7b1e 100644
--- a/res/drawable-hdpi/action_stream.png
+++ b/app/src/main/res/drawable-hdpi/action_stream.png
diff --git a/res/drawable-hdpi/action_stream_dark.png b/app/src/main/res/drawable-hdpi/action_stream_dark.png
index 97b752cea..97b752cea 100644
--- a/res/drawable-hdpi/action_stream_dark.png
+++ b/app/src/main/res/drawable-hdpi/action_stream_dark.png
diff --git a/res/drawable-hdpi/av_download.png b/app/src/main/res/drawable-hdpi/av_download.png
index 5bceafb1e..5bceafb1e 100644
--- a/res/drawable-hdpi/av_download.png
+++ b/app/src/main/res/drawable-hdpi/av_download.png
diff --git a/res/drawable-hdpi/av_download_dark.png b/app/src/main/res/drawable-hdpi/av_download_dark.png
index d5bfa457c..d5bfa457c 100755
--- a/res/drawable-hdpi/av_download_dark.png
+++ b/app/src/main/res/drawable-hdpi/av_download_dark.png
diff --git a/res/drawable-hdpi/av_fast_forward.png b/app/src/main/res/drawable-hdpi/av_fast_forward.png
index 58ee5c26c..58ee5c26c 100644
--- a/res/drawable-hdpi/av_fast_forward.png
+++ b/app/src/main/res/drawable-hdpi/av_fast_forward.png
diff --git a/res/drawable-hdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-hdpi/av_fast_forward_dark.png
index 237c4f846..237c4f846 100755
--- a/res/drawable-hdpi/av_fast_forward_dark.png
+++ b/app/src/main/res/drawable-hdpi/av_fast_forward_dark.png
diff --git a/res/drawable-hdpi/av_pause.png b/app/src/main/res/drawable-hdpi/av_pause.png
index 9661cfbb0..9661cfbb0 100644
--- a/res/drawable-hdpi/av_pause.png
+++ b/app/src/main/res/drawable-hdpi/av_pause.png
diff --git a/res/drawable-hdpi/av_pause_dark.png b/app/src/main/res/drawable-hdpi/av_pause_dark.png
index 6b435bb0f..6b435bb0f 100755
--- a/res/drawable-hdpi/av_pause_dark.png
+++ b/app/src/main/res/drawable-hdpi/av_pause_dark.png
diff --git a/res/drawable-hdpi/av_play.png b/app/src/main/res/drawable-hdpi/av_play.png
index e70f0413e..e70f0413e 100644
--- a/res/drawable-hdpi/av_play.png
+++ b/app/src/main/res/drawable-hdpi/av_play.png
diff --git a/res/drawable-hdpi/av_play_dark.png b/app/src/main/res/drawable-hdpi/av_play_dark.png
index df8a2ca28..df8a2ca28 100755
--- a/res/drawable-hdpi/av_play_dark.png
+++ b/app/src/main/res/drawable-hdpi/av_play_dark.png
diff --git a/res/drawable-hdpi/av_rewind.png b/app/src/main/res/drawable-hdpi/av_rewind.png
index e2f843ce2..e2f843ce2 100644
--- a/res/drawable-hdpi/av_rewind.png
+++ b/app/src/main/res/drawable-hdpi/av_rewind.png
diff --git a/res/drawable-hdpi/av_rewind_dark.png b/app/src/main/res/drawable-hdpi/av_rewind_dark.png
index caf517498..caf517498 100755
--- a/res/drawable-hdpi/av_rewind_dark.png
+++ b/app/src/main/res/drawable-hdpi/av_rewind_dark.png
diff --git a/res/drawable-hdpi/content_discard.png b/app/src/main/res/drawable-hdpi/content_discard.png
index e9ce89e04..e9ce89e04 100644
--- a/res/drawable-hdpi/content_discard.png
+++ b/app/src/main/res/drawable-hdpi/content_discard.png
diff --git a/res/drawable-hdpi/content_discard_dark.png b/app/src/main/res/drawable-hdpi/content_discard_dark.png
index ffd19d9e8..ffd19d9e8 100755
--- a/res/drawable-hdpi/content_discard_dark.png
+++ b/app/src/main/res/drawable-hdpi/content_discard_dark.png
diff --git a/res/drawable-hdpi/content_new.png b/app/src/main/res/drawable-hdpi/content_new.png
index 5741995cb..5741995cb 100644
--- a/res/drawable-hdpi/content_new.png
+++ b/app/src/main/res/drawable-hdpi/content_new.png
diff --git a/res/drawable-hdpi/content_new_dark.png b/app/src/main/res/drawable-hdpi/content_new_dark.png
index ad8ada6bd..ad8ada6bd 100755
--- a/res/drawable-hdpi/content_new_dark.png
+++ b/app/src/main/res/drawable-hdpi/content_new_dark.png
diff --git a/res/drawable-hdpi/default_cover.png b/app/src/main/res/drawable-hdpi/default_cover.png
index a6e67e2ca..a6e67e2ca 100644
--- a/res/drawable-hdpi/default_cover.png
+++ b/app/src/main/res/drawable-hdpi/default_cover.png
diff --git a/res/drawable-hdpi/default_cover_dark.png b/app/src/main/res/drawable-hdpi/default_cover_dark.png
index 0f650ee25..0f650ee25 100755
--- a/res/drawable-hdpi/default_cover_dark.png
+++ b/app/src/main/res/drawable-hdpi/default_cover_dark.png
diff --git a/res/drawable-hdpi/device_access_time.png b/app/src/main/res/drawable-hdpi/device_access_time.png
index 001549f38..001549f38 100644
--- a/res/drawable-hdpi/device_access_time.png
+++ b/app/src/main/res/drawable-hdpi/device_access_time.png
diff --git a/res/drawable-hdpi/device_access_time_dark.png b/app/src/main/res/drawable-hdpi/device_access_time_dark.png
index 314ec9319..314ec9319 100755
--- a/res/drawable-hdpi/device_access_time_dark.png
+++ b/app/src/main/res/drawable-hdpi/device_access_time_dark.png
diff --git a/res/drawable-hdpi/ic_action_overflow.png b/app/src/main/res/drawable-hdpi/ic_action_overflow.png
index 002fc4bfb..002fc4bfb 100644
--- a/res/drawable-hdpi/ic_action_overflow.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_overflow.png
diff --git a/res/drawable-hdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-hdpi/ic_action_overflow_dark.png
index c8792cbe2..c8792cbe2 100644
--- a/res/drawable-hdpi/ic_action_overflow_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_overflow_dark.png
diff --git a/res/drawable-hdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png
index 64b07728f..64b07728f 100755
--- a/res/drawable-hdpi/ic_action_pause_over_video.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png
diff --git a/res/drawable-hdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-hdpi/ic_action_play_over_video.png
index a364ca7c2..a364ca7c2 100755
--- a/res/drawable-hdpi/ic_action_play_over_video.png
+++ b/app/src/main/res/drawable-hdpi/ic_action_play_over_video.png
diff --git a/res/drawable-hdpi/ic_drag_handle.png b/app/src/main/res/drawable-hdpi/ic_drag_handle.png
index 38ec201de..38ec201de 100755
--- a/res/drawable-hdpi/ic_drag_handle.png
+++ b/app/src/main/res/drawable-hdpi/ic_drag_handle.png
diff --git a/res/drawable-hdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-hdpi/ic_drag_handle_dark.png
index e96d23252..e96d23252 100755
--- a/res/drawable-hdpi/ic_drag_handle_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_drag_handle_dark.png
diff --git a/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
index c59f601ca..c59f601ca 100644
--- a/res/drawable-hdpi/ic_drawer.png
+++ b/app/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/res/drawable-hdpi/ic_drawer_dark.png b/app/src/main/res/drawable-hdpi/ic_drawer_dark.png
index 6614ea4f4..6614ea4f4 100644
--- a/res/drawable-hdpi/ic_drawer_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_drawer_dark.png
diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
index 994b763cc..994b763cc 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-hdpi/ic_new.png b/app/src/main/res/drawable-hdpi/ic_new.png
index 8ff519052..8ff519052 100755
--- a/res/drawable-hdpi/ic_new.png
+++ b/app/src/main/res/drawable-hdpi/ic_new.png
diff --git a/res/drawable-hdpi/ic_new_dark.png b/app/src/main/res/drawable-hdpi/ic_new_dark.png
index c8581e01c..c8581e01c 100755
--- a/res/drawable-hdpi/ic_new_dark.png
+++ b/app/src/main/res/drawable-hdpi/ic_new_dark.png
diff --git a/res/drawable-hdpi/ic_stat_antenna.png b/app/src/main/res/drawable-hdpi/ic_stat_antenna.png
index 36d502492..36d502492 100644
--- a/res/drawable-hdpi/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-hdpi/ic_stat_antenna.png
diff --git a/res/drawable-hdpi/ic_stat_authentication.png b/app/src/main/res/drawable-hdpi/ic_stat_authentication.png
index c6b5efd33..c6b5efd33 100755
--- a/res/drawable-hdpi/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-hdpi/ic_stat_authentication.png
diff --git a/res/drawable-hdpi/location_web_site.png b/app/src/main/res/drawable-hdpi/location_web_site.png
index 6a2bc8857..6a2bc8857 100644
--- a/res/drawable-hdpi/location_web_site.png
+++ b/app/src/main/res/drawable-hdpi/location_web_site.png
diff --git a/res/drawable-hdpi/location_web_site_dark.png b/app/src/main/res/drawable-hdpi/location_web_site_dark.png
index e154afdbc..e154afdbc 100755
--- a/res/drawable-hdpi/location_web_site_dark.png
+++ b/app/src/main/res/drawable-hdpi/location_web_site_dark.png
diff --git a/res/drawable-hdpi/navigation_accept.png b/app/src/main/res/drawable-hdpi/navigation_accept.png
index 58bf97217..58bf97217 100644
--- a/res/drawable-hdpi/navigation_accept.png
+++ b/app/src/main/res/drawable-hdpi/navigation_accept.png
diff --git a/res/drawable-hdpi/navigation_accept_dark.png b/app/src/main/res/drawable-hdpi/navigation_accept_dark.png
index 53cf6877e..53cf6877e 100755
--- a/res/drawable-hdpi/navigation_accept_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_accept_dark.png
diff --git a/res/drawable-hdpi/navigation_cancel.png b/app/src/main/res/drawable-hdpi/navigation_cancel.png
index cde36e1fa..cde36e1fa 100644
--- a/res/drawable-hdpi/navigation_cancel.png
+++ b/app/src/main/res/drawable-hdpi/navigation_cancel.png
diff --git a/res/drawable-hdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-hdpi/navigation_cancel_dark.png
index 094eea589..094eea589 100755
--- a/res/drawable-hdpi/navigation_cancel_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_cancel_dark.png
diff --git a/res/drawable-hdpi/navigation_chapters.png b/app/src/main/res/drawable-hdpi/navigation_chapters.png
index b034459bc..b034459bc 100755
--- a/res/drawable-hdpi/navigation_chapters.png
+++ b/app/src/main/res/drawable-hdpi/navigation_chapters.png
diff --git a/res/drawable-hdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-hdpi/navigation_chapters_dark.png
index 7b0d4889c..7b0d4889c 100755
--- a/res/drawable-hdpi/navigation_chapters_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_chapters_dark.png
diff --git a/res/drawable-hdpi/navigation_collapse.png b/app/src/main/res/drawable-hdpi/navigation_collapse.png
index bd405bada..bd405bada 100755
--- a/res/drawable-hdpi/navigation_collapse.png
+++ b/app/src/main/res/drawable-hdpi/navigation_collapse.png
diff --git a/res/drawable-hdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-hdpi/navigation_collapse_dark.png
index ca78f2ec0..ca78f2ec0 100755
--- a/res/drawable-hdpi/navigation_collapse_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_collapse_dark.png
diff --git a/res/drawable-hdpi/navigation_expand.png b/app/src/main/res/drawable-hdpi/navigation_expand.png
index 8225e74b7..8225e74b7 100644
--- a/res/drawable-hdpi/navigation_expand.png
+++ b/app/src/main/res/drawable-hdpi/navigation_expand.png
diff --git a/res/drawable-hdpi/navigation_expand_dark.png b/app/src/main/res/drawable-hdpi/navigation_expand_dark.png
index 1676b104b..1676b104b 100755
--- a/res/drawable-hdpi/navigation_expand_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_expand_dark.png
diff --git a/res/drawable-hdpi/navigation_refresh.png b/app/src/main/res/drawable-hdpi/navigation_refresh.png
index 479aca465..479aca465 100644
--- a/res/drawable-hdpi/navigation_refresh.png
+++ b/app/src/main/res/drawable-hdpi/navigation_refresh.png
diff --git a/res/drawable-hdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-hdpi/navigation_refresh_dark.png
index bb9d855f7..bb9d855f7 100755
--- a/res/drawable-hdpi/navigation_refresh_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_refresh_dark.png
diff --git a/res/drawable-hdpi/navigation_shownotes.png b/app/src/main/res/drawable-hdpi/navigation_shownotes.png
index c5f6c97b2..c5f6c97b2 100755
--- a/res/drawable-hdpi/navigation_shownotes.png
+++ b/app/src/main/res/drawable-hdpi/navigation_shownotes.png
diff --git a/res/drawable-hdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-hdpi/navigation_shownotes_dark.png
index e45ea1fd9..e45ea1fd9 100755
--- a/res/drawable-hdpi/navigation_shownotes_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_shownotes_dark.png
diff --git a/res/drawable-hdpi/navigation_up.png b/app/src/main/res/drawable-hdpi/navigation_up.png
index a2cf2ba52..a2cf2ba52 100755
--- a/res/drawable-hdpi/navigation_up.png
+++ b/app/src/main/res/drawable-hdpi/navigation_up.png
diff --git a/res/drawable-hdpi/navigation_up_dark.png b/app/src/main/res/drawable-hdpi/navigation_up_dark.png
index f2374a323..f2374a323 100755
--- a/res/drawable-hdpi/navigation_up_dark.png
+++ b/app/src/main/res/drawable-hdpi/navigation_up_dark.png
diff --git a/res/drawable-hdpi/social_share.png b/app/src/main/res/drawable-hdpi/social_share.png
index 47ae18674..47ae18674 100644
--- a/res/drawable-hdpi/social_share.png
+++ b/app/src/main/res/drawable-hdpi/social_share.png
diff --git a/res/drawable-hdpi/social_share_dark.png b/app/src/main/res/drawable-hdpi/social_share_dark.png
index c329f58da..c329f58da 100755
--- a/res/drawable-hdpi/social_share_dark.png
+++ b/app/src/main/res/drawable-hdpi/social_share_dark.png
diff --git a/res/drawable-hdpi/spinner_button.9.png b/app/src/main/res/drawable-hdpi/spinner_button.9.png
index fa68a137f..fa68a137f 100644
--- a/res/drawable-hdpi/spinner_button.9.png
+++ b/app/src/main/res/drawable-hdpi/spinner_button.9.png
diff --git a/res/drawable-hdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-hdpi/spinner_button_dark.9.png
index 88f8765cd..88f8765cd 100644
--- a/res/drawable-hdpi/spinner_button_dark.9.png
+++ b/app/src/main/res/drawable-hdpi/spinner_button_dark.9.png
diff --git a/res/drawable-hdpi/stat_notify_sync.png b/app/src/main/res/drawable-hdpi/stat_notify_sync.png
index bfb8110fe..bfb8110fe 100644
--- a/res/drawable-hdpi/stat_notify_sync.png
+++ b/app/src/main/res/drawable-hdpi/stat_notify_sync.png
diff --git a/res/drawable-hdpi/stat_notify_sync_error.png b/app/src/main/res/drawable-hdpi/stat_notify_sync_error.png
index b340a313e..b340a313e 100644
--- a/res/drawable-hdpi/stat_notify_sync_error.png
+++ b/app/src/main/res/drawable-hdpi/stat_notify_sync_error.png
diff --git a/res/drawable-hdpi/stat_playlist.png b/app/src/main/res/drawable-hdpi/stat_playlist.png
index 93c3f02b8..93c3f02b8 100644
--- a/res/drawable-hdpi/stat_playlist.png
+++ b/app/src/main/res/drawable-hdpi/stat_playlist.png
diff --git a/res/drawable-hdpi/stat_playlist_dark.png b/app/src/main/res/drawable-hdpi/stat_playlist_dark.png
index 972ce98b3..972ce98b3 100644
--- a/res/drawable-hdpi/stat_playlist_dark.png
+++ b/app/src/main/res/drawable-hdpi/stat_playlist_dark.png
diff --git a/res/drawable-hdpi/type_audio.png b/app/src/main/res/drawable-hdpi/type_audio.png
index d43e8a33c..d43e8a33c 100644
--- a/res/drawable-hdpi/type_audio.png
+++ b/app/src/main/res/drawable-hdpi/type_audio.png
diff --git a/res/drawable-hdpi/type_audio_dark.png b/app/src/main/res/drawable-hdpi/type_audio_dark.png
index 7b69ea56b..7b69ea56b 100755
--- a/res/drawable-hdpi/type_audio_dark.png
+++ b/app/src/main/res/drawable-hdpi/type_audio_dark.png
diff --git a/res/drawable-hdpi/type_video.png b/app/src/main/res/drawable-hdpi/type_video.png
index f9467146c..f9467146c 100644
--- a/res/drawable-hdpi/type_video.png
+++ b/app/src/main/res/drawable-hdpi/type_video.png
diff --git a/res/drawable-hdpi/type_video_dark.png b/app/src/main/res/drawable-hdpi/type_video_dark.png
index 37f3a93a2..37f3a93a2 100755
--- a/res/drawable-hdpi/type_video_dark.png
+++ b/app/src/main/res/drawable-hdpi/type_video_dark.png
diff --git a/res/drawable-ldpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_antenna.png
index e44f42510..e44f42510 100644
--- a/res/drawable-ldpi-v11/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-ldpi-v11/ic_stat_antenna.png
diff --git a/res/drawable-ldpi/action_stream.png b/app/src/main/res/drawable-ldpi/action_stream.png
index 5ae4f3d34..5ae4f3d34 100644
--- a/res/drawable-ldpi/action_stream.png
+++ b/app/src/main/res/drawable-ldpi/action_stream.png
diff --git a/res/drawable-ldpi/action_stream_dark.png b/app/src/main/res/drawable-ldpi/action_stream_dark.png
index f3c81fff8..f3c81fff8 100644
--- a/res/drawable-ldpi/action_stream_dark.png
+++ b/app/src/main/res/drawable-ldpi/action_stream_dark.png
diff --git a/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png
index 546090dd2..546090dd2 100644
--- a/res/drawable-ldpi/ic_launcher.png
+++ b/app/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/res/drawable-ldpi/ic_stat_antenna.png b/app/src/main/res/drawable-ldpi/ic_stat_antenna.png
index 63d72970d..63d72970d 100644
--- a/res/drawable-ldpi/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-ldpi/ic_stat_antenna.png
diff --git a/res/drawable-ldpi/stat_playlist.png b/app/src/main/res/drawable-ldpi/stat_playlist.png
index 3a702ef2f..3a702ef2f 100644
--- a/res/drawable-ldpi/stat_playlist.png
+++ b/app/src/main/res/drawable-ldpi/stat_playlist.png
diff --git a/res/drawable-ldpi/stat_playlist_dark.png b/app/src/main/res/drawable-ldpi/stat_playlist_dark.png
index b82b06f67..b82b06f67 100644
--- a/res/drawable-ldpi/stat_playlist_dark.png
+++ b/app/src/main/res/drawable-ldpi/stat_playlist_dark.png
diff --git a/res/drawable-mdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_antenna.png
index 8808dedc7..8808dedc7 100644
--- a/res/drawable-mdpi-v11/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-mdpi-v11/ic_stat_antenna.png
diff --git a/res/drawable-mdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png
index de69b17c0..de69b17c0 100755
--- a/res/drawable-mdpi-v11/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png
diff --git a/res/drawable-mdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync.png
index 1be8677f1..1be8677f1 100644
--- a/res/drawable-mdpi-v11/stat_notify_sync.png
+++ b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync.png
diff --git a/res/drawable-mdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync_error.png
index 30658c583..30658c583 100644
--- a/res/drawable-mdpi-v11/stat_notify_sync_error.png
+++ b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync_error.png
diff --git a/res/drawable-mdpi/action_about.png b/app/src/main/res/drawable-mdpi/action_about.png
index 7c57436fc..7c57436fc 100644
--- a/res/drawable-mdpi/action_about.png
+++ b/app/src/main/res/drawable-mdpi/action_about.png
diff --git a/res/drawable-mdpi/action_about_dark.png b/app/src/main/res/drawable-mdpi/action_about_dark.png
index d7b7e6986..d7b7e6986 100755
--- a/res/drawable-mdpi/action_about_dark.png
+++ b/app/src/main/res/drawable-mdpi/action_about_dark.png
diff --git a/res/drawable-mdpi/action_search.png b/app/src/main/res/drawable-mdpi/action_search.png
index 3aa644048..3aa644048 100644
--- a/res/drawable-mdpi/action_search.png
+++ b/app/src/main/res/drawable-mdpi/action_search.png
diff --git a/res/drawable-mdpi/action_search_dark.png b/app/src/main/res/drawable-mdpi/action_search_dark.png
index 587d9e0bf..587d9e0bf 100755
--- a/res/drawable-mdpi/action_search_dark.png
+++ b/app/src/main/res/drawable-mdpi/action_search_dark.png
diff --git a/res/drawable-mdpi/action_settings.png b/app/src/main/res/drawable-mdpi/action_settings.png
index dc66d914e..dc66d914e 100644
--- a/res/drawable-mdpi/action_settings.png
+++ b/app/src/main/res/drawable-mdpi/action_settings.png
diff --git a/res/drawable-mdpi/action_settings_dark.png b/app/src/main/res/drawable-mdpi/action_settings_dark.png
index d3e42edcb..d3e42edcb 100755
--- a/res/drawable-mdpi/action_settings_dark.png
+++ b/app/src/main/res/drawable-mdpi/action_settings_dark.png
diff --git a/res/drawable-mdpi/action_stream.png b/app/src/main/res/drawable-mdpi/action_stream.png
index 4bc7d8379..4bc7d8379 100644
--- a/res/drawable-mdpi/action_stream.png
+++ b/app/src/main/res/drawable-mdpi/action_stream.png
diff --git a/res/drawable-mdpi/action_stream_dark.png b/app/src/main/res/drawable-mdpi/action_stream_dark.png
index 1f4fdd186..1f4fdd186 100644
--- a/res/drawable-mdpi/action_stream_dark.png
+++ b/app/src/main/res/drawable-mdpi/action_stream_dark.png
diff --git a/res/drawable-mdpi/av_download.png b/app/src/main/res/drawable-mdpi/av_download.png
index 678ecfad4..678ecfad4 100644
--- a/res/drawable-mdpi/av_download.png
+++ b/app/src/main/res/drawable-mdpi/av_download.png
diff --git a/res/drawable-mdpi/av_download_dark.png b/app/src/main/res/drawable-mdpi/av_download_dark.png
index cc4d9576b..cc4d9576b 100755
--- a/res/drawable-mdpi/av_download_dark.png
+++ b/app/src/main/res/drawable-mdpi/av_download_dark.png
diff --git a/res/drawable-mdpi/av_fast_forward.png b/app/src/main/res/drawable-mdpi/av_fast_forward.png
index 43f15a245..43f15a245 100644
--- a/res/drawable-mdpi/av_fast_forward.png
+++ b/app/src/main/res/drawable-mdpi/av_fast_forward.png
diff --git a/res/drawable-mdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-mdpi/av_fast_forward_dark.png
index fc8074cea..fc8074cea 100755
--- a/res/drawable-mdpi/av_fast_forward_dark.png
+++ b/app/src/main/res/drawable-mdpi/av_fast_forward_dark.png
diff --git a/res/drawable-mdpi/av_pause.png b/app/src/main/res/drawable-mdpi/av_pause.png
index 01858e34d..01858e34d 100644
--- a/res/drawable-mdpi/av_pause.png
+++ b/app/src/main/res/drawable-mdpi/av_pause.png
diff --git a/res/drawable-mdpi/av_pause_dark.png b/app/src/main/res/drawable-mdpi/av_pause_dark.png
index a5aee6f2c..a5aee6f2c 100755
--- a/res/drawable-mdpi/av_pause_dark.png
+++ b/app/src/main/res/drawable-mdpi/av_pause_dark.png
diff --git a/res/drawable-mdpi/av_play.png b/app/src/main/res/drawable-mdpi/av_play.png
index 1e3bc97af..1e3bc97af 100644
--- a/res/drawable-mdpi/av_play.png
+++ b/app/src/main/res/drawable-mdpi/av_play.png
diff --git a/res/drawable-mdpi/av_play_dark.png b/app/src/main/res/drawable-mdpi/av_play_dark.png
index 6a40cd5f7..6a40cd5f7 100755
--- a/res/drawable-mdpi/av_play_dark.png
+++ b/app/src/main/res/drawable-mdpi/av_play_dark.png
diff --git a/res/drawable-mdpi/av_rewind.png b/app/src/main/res/drawable-mdpi/av_rewind.png
index a2f7f5895..a2f7f5895 100644
--- a/res/drawable-mdpi/av_rewind.png
+++ b/app/src/main/res/drawable-mdpi/av_rewind.png
diff --git a/res/drawable-mdpi/av_rewind_dark.png b/app/src/main/res/drawable-mdpi/av_rewind_dark.png
index e555a2046..e555a2046 100755
--- a/res/drawable-mdpi/av_rewind_dark.png
+++ b/app/src/main/res/drawable-mdpi/av_rewind_dark.png
diff --git a/res/drawable-mdpi/content_discard.png b/app/src/main/res/drawable-mdpi/content_discard.png
index cedb1085b..cedb1085b 100644
--- a/res/drawable-mdpi/content_discard.png
+++ b/app/src/main/res/drawable-mdpi/content_discard.png
diff --git a/res/drawable-mdpi/content_discard_dark.png b/app/src/main/res/drawable-mdpi/content_discard_dark.png
index a8ee5f253..a8ee5f253 100755
--- a/res/drawable-mdpi/content_discard_dark.png
+++ b/app/src/main/res/drawable-mdpi/content_discard_dark.png
diff --git a/res/drawable-mdpi/content_new.png b/app/src/main/res/drawable-mdpi/content_new.png
index 884c9d270..884c9d270 100644
--- a/res/drawable-mdpi/content_new.png
+++ b/app/src/main/res/drawable-mdpi/content_new.png
diff --git a/res/drawable-mdpi/content_new_dark.png b/app/src/main/res/drawable-mdpi/content_new_dark.png
index 4d5d484b3..4d5d484b3 100755
--- a/res/drawable-mdpi/content_new_dark.png
+++ b/app/src/main/res/drawable-mdpi/content_new_dark.png
diff --git a/res/drawable-mdpi/default_cover.png b/app/src/main/res/drawable-mdpi/default_cover.png
index 62adf32ab..62adf32ab 100644
--- a/res/drawable-mdpi/default_cover.png
+++ b/app/src/main/res/drawable-mdpi/default_cover.png
diff --git a/res/drawable-mdpi/default_cover_dark.png b/app/src/main/res/drawable-mdpi/default_cover_dark.png
index d6235554b..d6235554b 100755
--- a/res/drawable-mdpi/default_cover_dark.png
+++ b/app/src/main/res/drawable-mdpi/default_cover_dark.png
diff --git a/res/drawable-mdpi/device_access_time.png b/app/src/main/res/drawable-mdpi/device_access_time.png
index de9b4fb2a..de9b4fb2a 100644
--- a/res/drawable-mdpi/device_access_time.png
+++ b/app/src/main/res/drawable-mdpi/device_access_time.png
diff --git a/res/drawable-mdpi/device_access_time_dark.png b/app/src/main/res/drawable-mdpi/device_access_time_dark.png
index a09df2b99..a09df2b99 100755
--- a/res/drawable-mdpi/device_access_time_dark.png
+++ b/app/src/main/res/drawable-mdpi/device_access_time_dark.png
diff --git a/res/drawable-mdpi/ic_action_overflow.png b/app/src/main/res/drawable-mdpi/ic_action_overflow.png
index 6f0fb23f4..6f0fb23f4 100644
--- a/res/drawable-mdpi/ic_action_overflow.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_overflow.png
diff --git a/res/drawable-mdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-mdpi/ic_action_overflow_dark.png
index b4a4a221f..b4a4a221f 100644
--- a/res/drawable-mdpi/ic_action_overflow_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_overflow_dark.png
diff --git a/res/drawable-mdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png
index f478ac321..f478ac321 100755
--- a/res/drawable-mdpi/ic_action_pause_over_video.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png
diff --git a/res/drawable-mdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-mdpi/ic_action_play_over_video.png
index 835ff3636..835ff3636 100755
--- a/res/drawable-mdpi/ic_action_play_over_video.png
+++ b/app/src/main/res/drawable-mdpi/ic_action_play_over_video.png
diff --git a/res/drawable-mdpi/ic_drag_handle.png b/app/src/main/res/drawable-mdpi/ic_drag_handle.png
index 4afbdc67d..4afbdc67d 100755
--- a/res/drawable-mdpi/ic_drag_handle.png
+++ b/app/src/main/res/drawable-mdpi/ic_drag_handle.png
diff --git a/res/drawable-mdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-mdpi/ic_drag_handle_dark.png
index 2b25c4101..2b25c4101 100755
--- a/res/drawable-mdpi/ic_drag_handle_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_drag_handle_dark.png
diff --git a/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
index 1ed2c56ee..1ed2c56ee 100644
--- a/res/drawable-mdpi/ic_drawer.png
+++ b/app/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/res/drawable-mdpi/ic_drawer_dark.png b/app/src/main/res/drawable-mdpi/ic_drawer_dark.png
index b05c026c1..b05c026c1 100644
--- a/res/drawable-mdpi/ic_drawer_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_drawer_dark.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
index 403dfabc4..403dfabc4 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_new.png b/app/src/main/res/drawable-mdpi/ic_new.png
index 84994bd10..84994bd10 100755
--- a/res/drawable-mdpi/ic_new.png
+++ b/app/src/main/res/drawable-mdpi/ic_new.png
diff --git a/res/drawable-mdpi/ic_new_dark.png b/app/src/main/res/drawable-mdpi/ic_new_dark.png
index b723618b4..b723618b4 100755
--- a/res/drawable-mdpi/ic_new_dark.png
+++ b/app/src/main/res/drawable-mdpi/ic_new_dark.png
diff --git a/res/drawable-mdpi/ic_stat_antenna.png b/app/src/main/res/drawable-mdpi/ic_stat_antenna.png
index 8b1206b51..8b1206b51 100644
--- a/res/drawable-mdpi/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-mdpi/ic_stat_antenna.png
diff --git a/res/drawable-mdpi/ic_stat_authentication.png b/app/src/main/res/drawable-mdpi/ic_stat_authentication.png
index cadfb9643..cadfb9643 100755
--- a/res/drawable-mdpi/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-mdpi/ic_stat_authentication.png
diff --git a/res/drawable-mdpi/location_web_site.png b/app/src/main/res/drawable-mdpi/location_web_site.png
index f146cf997..f146cf997 100644
--- a/res/drawable-mdpi/location_web_site.png
+++ b/app/src/main/res/drawable-mdpi/location_web_site.png
diff --git a/res/drawable-mdpi/location_web_site_dark.png b/app/src/main/res/drawable-mdpi/location_web_site_dark.png
index 41b56ec92..41b56ec92 100755
--- a/res/drawable-mdpi/location_web_site_dark.png
+++ b/app/src/main/res/drawable-mdpi/location_web_site_dark.png
diff --git a/res/drawable-mdpi/navigation_accept.png b/app/src/main/res/drawable-mdpi/navigation_accept.png
index cf5fab3ad..cf5fab3ad 100644
--- a/res/drawable-mdpi/navigation_accept.png
+++ b/app/src/main/res/drawable-mdpi/navigation_accept.png
diff --git a/res/drawable-mdpi/navigation_accept_dark.png b/app/src/main/res/drawable-mdpi/navigation_accept_dark.png
index 35cda8e11..35cda8e11 100755
--- a/res/drawable-mdpi/navigation_accept_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_accept_dark.png
diff --git a/res/drawable-mdpi/navigation_cancel.png b/app/src/main/res/drawable-mdpi/navigation_cancel.png
index 9f4c3d6a2..9f4c3d6a2 100644
--- a/res/drawable-mdpi/navigation_cancel.png
+++ b/app/src/main/res/drawable-mdpi/navigation_cancel.png
diff --git a/res/drawable-mdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-mdpi/navigation_cancel_dark.png
index 3336760d5..3336760d5 100755
--- a/res/drawable-mdpi/navigation_cancel_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_cancel_dark.png
diff --git a/res/drawable-mdpi/navigation_chapters.png b/app/src/main/res/drawable-mdpi/navigation_chapters.png
index b1884726c..b1884726c 100755
--- a/res/drawable-mdpi/navigation_chapters.png
+++ b/app/src/main/res/drawable-mdpi/navigation_chapters.png
diff --git a/res/drawable-mdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-mdpi/navigation_chapters_dark.png
index 1042294e4..1042294e4 100755
--- a/res/drawable-mdpi/navigation_chapters_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_chapters_dark.png
diff --git a/res/drawable-mdpi/navigation_collapse.png b/app/src/main/res/drawable-mdpi/navigation_collapse.png
index 6673c7aea..6673c7aea 100755
--- a/res/drawable-mdpi/navigation_collapse.png
+++ b/app/src/main/res/drawable-mdpi/navigation_collapse.png
diff --git a/res/drawable-mdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-mdpi/navigation_collapse_dark.png
index 01d6511ee..01d6511ee 100755
--- a/res/drawable-mdpi/navigation_collapse_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_collapse_dark.png
diff --git a/res/drawable-mdpi/navigation_expand.png b/app/src/main/res/drawable-mdpi/navigation_expand.png
index 78107862c..78107862c 100644
--- a/res/drawable-mdpi/navigation_expand.png
+++ b/app/src/main/res/drawable-mdpi/navigation_expand.png
diff --git a/res/drawable-mdpi/navigation_expand_dark.png b/app/src/main/res/drawable-mdpi/navigation_expand_dark.png
index aa2b40ca0..aa2b40ca0 100755
--- a/res/drawable-mdpi/navigation_expand_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_expand_dark.png
diff --git a/res/drawable-mdpi/navigation_refresh.png b/app/src/main/res/drawable-mdpi/navigation_refresh.png
index 63e70e178..63e70e178 100644
--- a/res/drawable-mdpi/navigation_refresh.png
+++ b/app/src/main/res/drawable-mdpi/navigation_refresh.png
diff --git a/res/drawable-mdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-mdpi/navigation_refresh_dark.png
index bd611e8e2..bd611e8e2 100755
--- a/res/drawable-mdpi/navigation_refresh_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_refresh_dark.png
diff --git a/res/drawable-mdpi/navigation_shownotes.png b/app/src/main/res/drawable-mdpi/navigation_shownotes.png
index ec6a2bf8f..ec6a2bf8f 100755
--- a/res/drawable-mdpi/navigation_shownotes.png
+++ b/app/src/main/res/drawable-mdpi/navigation_shownotes.png
diff --git a/res/drawable-mdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-mdpi/navigation_shownotes_dark.png
index 9c748b0b5..9c748b0b5 100755
--- a/res/drawable-mdpi/navigation_shownotes_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_shownotes_dark.png
diff --git a/res/drawable-mdpi/navigation_up.png b/app/src/main/res/drawable-mdpi/navigation_up.png
index 1ee248a79..1ee248a79 100755
--- a/res/drawable-mdpi/navigation_up.png
+++ b/app/src/main/res/drawable-mdpi/navigation_up.png
diff --git a/res/drawable-mdpi/navigation_up_dark.png b/app/src/main/res/drawable-mdpi/navigation_up_dark.png
index 8ef44cbac..8ef44cbac 100755
--- a/res/drawable-mdpi/navigation_up_dark.png
+++ b/app/src/main/res/drawable-mdpi/navigation_up_dark.png
diff --git a/res/drawable-mdpi/social_share.png b/app/src/main/res/drawable-mdpi/social_share.png
index 8aa52bc7d..8aa52bc7d 100644
--- a/res/drawable-mdpi/social_share.png
+++ b/app/src/main/res/drawable-mdpi/social_share.png
diff --git a/res/drawable-mdpi/social_share_dark.png b/app/src/main/res/drawable-mdpi/social_share_dark.png
index 056deb57b..056deb57b 100755
--- a/res/drawable-mdpi/social_share_dark.png
+++ b/app/src/main/res/drawable-mdpi/social_share_dark.png
diff --git a/res/drawable-mdpi/spinner_button.9.png b/app/src/main/res/drawable-mdpi/spinner_button.9.png
index 716560bb1..716560bb1 100644
--- a/res/drawable-mdpi/spinner_button.9.png
+++ b/app/src/main/res/drawable-mdpi/spinner_button.9.png
diff --git a/res/drawable-mdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-mdpi/spinner_button_dark.9.png
index 8d7594685..8d7594685 100644
--- a/res/drawable-mdpi/spinner_button_dark.9.png
+++ b/app/src/main/res/drawable-mdpi/spinner_button_dark.9.png
diff --git a/res/drawable-mdpi/stat_notify_sync.png b/app/src/main/res/drawable-mdpi/stat_notify_sync.png
index 03ce57a47..03ce57a47 100644
--- a/res/drawable-mdpi/stat_notify_sync.png
+++ b/app/src/main/res/drawable-mdpi/stat_notify_sync.png
diff --git a/res/drawable-mdpi/stat_notify_sync_error.png b/app/src/main/res/drawable-mdpi/stat_notify_sync_error.png
index f849b5040..f849b5040 100644
--- a/res/drawable-mdpi/stat_notify_sync_error.png
+++ b/app/src/main/res/drawable-mdpi/stat_notify_sync_error.png
diff --git a/res/drawable-mdpi/stat_playlist.png b/app/src/main/res/drawable-mdpi/stat_playlist.png
index 136a7a265..136a7a265 100644
--- a/res/drawable-mdpi/stat_playlist.png
+++ b/app/src/main/res/drawable-mdpi/stat_playlist.png
diff --git a/res/drawable-mdpi/stat_playlist_dark.png b/app/src/main/res/drawable-mdpi/stat_playlist_dark.png
index 7ed94b13c..7ed94b13c 100644
--- a/res/drawable-mdpi/stat_playlist_dark.png
+++ b/app/src/main/res/drawable-mdpi/stat_playlist_dark.png
diff --git a/res/drawable-mdpi/type_audio.png b/app/src/main/res/drawable-mdpi/type_audio.png
index 4ec9efd97..4ec9efd97 100644
--- a/res/drawable-mdpi/type_audio.png
+++ b/app/src/main/res/drawable-mdpi/type_audio.png
diff --git a/res/drawable-mdpi/type_audio_dark.png b/app/src/main/res/drawable-mdpi/type_audio_dark.png
index f8dd8469c..f8dd8469c 100755
--- a/res/drawable-mdpi/type_audio_dark.png
+++ b/app/src/main/res/drawable-mdpi/type_audio_dark.png
diff --git a/res/drawable-mdpi/type_video.png b/app/src/main/res/drawable-mdpi/type_video.png
index a2722b812..a2722b812 100644
--- a/res/drawable-mdpi/type_video.png
+++ b/app/src/main/res/drawable-mdpi/type_video.png
diff --git a/res/drawable-mdpi/type_video_dark.png b/app/src/main/res/drawable-mdpi/type_video_dark.png
index aa0c320dc..aa0c320dc 100755
--- a/res/drawable-mdpi/type_video_dark.png
+++ b/app/src/main/res/drawable-mdpi/type_video_dark.png
diff --git a/res/drawable-xhdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_antenna.png
index 59de64c87..59de64c87 100644
--- a/res/drawable-xhdpi-v11/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-xhdpi-v11/ic_stat_antenna.png
diff --git a/res/drawable-xhdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png
index f58fb21df..f58fb21df 100755
--- a/res/drawable-xhdpi-v11/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png
diff --git a/res/drawable-xhdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync.png
index b3bf21ffe..b3bf21ffe 100644
--- a/res/drawable-xhdpi-v11/stat_notify_sync.png
+++ b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync.png
diff --git a/res/drawable-xhdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync_error.png
index 33582ef10..33582ef10 100644
--- a/res/drawable-xhdpi-v11/stat_notify_sync_error.png
+++ b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync_error.png
diff --git a/res/drawable-xhdpi/action_about.png b/app/src/main/res/drawable-xhdpi/action_about.png
index 2641f142a..2641f142a 100644
--- a/res/drawable-xhdpi/action_about.png
+++ b/app/src/main/res/drawable-xhdpi/action_about.png
diff --git a/res/drawable-xhdpi/action_about_dark.png b/app/src/main/res/drawable-xhdpi/action_about_dark.png
index 4ee903f07..4ee903f07 100755
--- a/res/drawable-xhdpi/action_about_dark.png
+++ b/app/src/main/res/drawable-xhdpi/action_about_dark.png
diff --git a/res/drawable-xhdpi/action_search.png b/app/src/main/res/drawable-xhdpi/action_search.png
index 804420aee..804420aee 100644
--- a/res/drawable-xhdpi/action_search.png
+++ b/app/src/main/res/drawable-xhdpi/action_search.png
diff --git a/res/drawable-xhdpi/action_search_dark.png b/app/src/main/res/drawable-xhdpi/action_search_dark.png
index 3549f84dd..3549f84dd 100755
--- a/res/drawable-xhdpi/action_search_dark.png
+++ b/app/src/main/res/drawable-xhdpi/action_search_dark.png
diff --git a/res/drawable-xhdpi/action_settings.png b/app/src/main/res/drawable-xhdpi/action_settings.png
index 04b65dc34..04b65dc34 100644
--- a/res/drawable-xhdpi/action_settings.png
+++ b/app/src/main/res/drawable-xhdpi/action_settings.png
diff --git a/res/drawable-xhdpi/action_settings_dark.png b/app/src/main/res/drawable-xhdpi/action_settings_dark.png
index 09b014834..09b014834 100755
--- a/res/drawable-xhdpi/action_settings_dark.png
+++ b/app/src/main/res/drawable-xhdpi/action_settings_dark.png
diff --git a/res/drawable-xhdpi/action_stream.png b/app/src/main/res/drawable-xhdpi/action_stream.png
index f87f2da5e..f87f2da5e 100644
--- a/res/drawable-xhdpi/action_stream.png
+++ b/app/src/main/res/drawable-xhdpi/action_stream.png
diff --git a/res/drawable-xhdpi/action_stream_dark.png b/app/src/main/res/drawable-xhdpi/action_stream_dark.png
index d3721318c..d3721318c 100644
--- a/res/drawable-xhdpi/action_stream_dark.png
+++ b/app/src/main/res/drawable-xhdpi/action_stream_dark.png
diff --git a/res/drawable-xhdpi/av_download.png b/app/src/main/res/drawable-xhdpi/av_download.png
index dfe81e064..dfe81e064 100644
--- a/res/drawable-xhdpi/av_download.png
+++ b/app/src/main/res/drawable-xhdpi/av_download.png
diff --git a/res/drawable-xhdpi/av_download_dark.png b/app/src/main/res/drawable-xhdpi/av_download_dark.png
index bc0ced50f..bc0ced50f 100755
--- a/res/drawable-xhdpi/av_download_dark.png
+++ b/app/src/main/res/drawable-xhdpi/av_download_dark.png
diff --git a/res/drawable-xhdpi/av_fast_forward.png b/app/src/main/res/drawable-xhdpi/av_fast_forward.png
index 026c3b779..026c3b779 100644
--- a/res/drawable-xhdpi/av_fast_forward.png
+++ b/app/src/main/res/drawable-xhdpi/av_fast_forward.png
diff --git a/res/drawable-xhdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-xhdpi/av_fast_forward_dark.png
index 896334d47..896334d47 100755
--- a/res/drawable-xhdpi/av_fast_forward_dark.png
+++ b/app/src/main/res/drawable-xhdpi/av_fast_forward_dark.png
diff --git a/res/drawable-xhdpi/av_pause.png b/app/src/main/res/drawable-xhdpi/av_pause.png
index 97d6f91ac..97d6f91ac 100644
--- a/res/drawable-xhdpi/av_pause.png
+++ b/app/src/main/res/drawable-xhdpi/av_pause.png
diff --git a/res/drawable-xhdpi/av_pause_dark.png b/app/src/main/res/drawable-xhdpi/av_pause_dark.png
index 333c1b24d..333c1b24d 100755
--- a/res/drawable-xhdpi/av_pause_dark.png
+++ b/app/src/main/res/drawable-xhdpi/av_pause_dark.png
diff --git a/res/drawable-xhdpi/av_play.png b/app/src/main/res/drawable-xhdpi/av_play.png
index 2d67d31e7..2d67d31e7 100644
--- a/res/drawable-xhdpi/av_play.png
+++ b/app/src/main/res/drawable-xhdpi/av_play.png
diff --git a/res/drawable-xhdpi/av_play_dark.png b/app/src/main/res/drawable-xhdpi/av_play_dark.png
index 51124993d..51124993d 100755
--- a/res/drawable-xhdpi/av_play_dark.png
+++ b/app/src/main/res/drawable-xhdpi/av_play_dark.png
diff --git a/res/drawable-xhdpi/av_rewind.png b/app/src/main/res/drawable-xhdpi/av_rewind.png
index 57b41744d..57b41744d 100644
--- a/res/drawable-xhdpi/av_rewind.png
+++ b/app/src/main/res/drawable-xhdpi/av_rewind.png
diff --git a/res/drawable-xhdpi/av_rewind_dark.png b/app/src/main/res/drawable-xhdpi/av_rewind_dark.png
index 69dda127c..69dda127c 100755
--- a/res/drawable-xhdpi/av_rewind_dark.png
+++ b/app/src/main/res/drawable-xhdpi/av_rewind_dark.png
diff --git a/res/drawable-xhdpi/content_discard.png b/app/src/main/res/drawable-xhdpi/content_discard.png
index 98c73da1f..98c73da1f 100644
--- a/res/drawable-xhdpi/content_discard.png
+++ b/app/src/main/res/drawable-xhdpi/content_discard.png
diff --git a/res/drawable-xhdpi/content_discard_dark.png b/app/src/main/res/drawable-xhdpi/content_discard_dark.png
index 412b33354..412b33354 100755
--- a/res/drawable-xhdpi/content_discard_dark.png
+++ b/app/src/main/res/drawable-xhdpi/content_discard_dark.png
diff --git a/res/drawable-xhdpi/content_new.png b/app/src/main/res/drawable-xhdpi/content_new.png
index 9b48a63da..9b48a63da 100644
--- a/res/drawable-xhdpi/content_new.png
+++ b/app/src/main/res/drawable-xhdpi/content_new.png
diff --git a/res/drawable-xhdpi/content_new_dark.png b/app/src/main/res/drawable-xhdpi/content_new_dark.png
index 23b9a1c18..23b9a1c18 100755
--- a/res/drawable-xhdpi/content_new_dark.png
+++ b/app/src/main/res/drawable-xhdpi/content_new_dark.png
diff --git a/res/drawable-xhdpi/content_remove.png b/app/src/main/res/drawable-xhdpi/content_remove.png
index ca7d159fd..ca7d159fd 100644
--- a/res/drawable-xhdpi/content_remove.png
+++ b/app/src/main/res/drawable-xhdpi/content_remove.png
diff --git a/res/drawable-xhdpi/content_remove_dark.png b/app/src/main/res/drawable-xhdpi/content_remove_dark.png
index f391760ef..f391760ef 100755
--- a/res/drawable-xhdpi/content_remove_dark.png
+++ b/app/src/main/res/drawable-xhdpi/content_remove_dark.png
diff --git a/res/drawable-xhdpi/default_cover.png b/app/src/main/res/drawable-xhdpi/default_cover.png
index c2f4578f9..c2f4578f9 100644
--- a/res/drawable-xhdpi/default_cover.png
+++ b/app/src/main/res/drawable-xhdpi/default_cover.png
diff --git a/res/drawable-xhdpi/default_cover_dark.png b/app/src/main/res/drawable-xhdpi/default_cover_dark.png
index 3f93e4f65..3f93e4f65 100755
--- a/res/drawable-xhdpi/default_cover_dark.png
+++ b/app/src/main/res/drawable-xhdpi/default_cover_dark.png
diff --git a/res/drawable-xhdpi/device_access_time.png b/app/src/main/res/drawable-xhdpi/device_access_time.png
index 2beae08c3..2beae08c3 100644
--- a/res/drawable-xhdpi/device_access_time.png
+++ b/app/src/main/res/drawable-xhdpi/device_access_time.png
diff --git a/res/drawable-xhdpi/device_access_time_dark.png b/app/src/main/res/drawable-xhdpi/device_access_time_dark.png
index c8771db97..c8771db97 100755
--- a/res/drawable-xhdpi/device_access_time_dark.png
+++ b/app/src/main/res/drawable-xhdpi/device_access_time_dark.png
diff --git a/res/drawable-xhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
index 7ba4e10ea..7ba4e10ea 100644
--- a/res/drawable-xhdpi/ic_action_overflow.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
diff --git a/res/drawable-xhdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png
index 5d8af5d63..5d8af5d63 100644
--- a/res/drawable-xhdpi/ic_action_overflow_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png
diff --git a/res/drawable-xhdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png
index b0777a023..b0777a023 100755
--- a/res/drawable-xhdpi/ic_action_pause_over_video.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png
diff --git a/res/drawable-xhdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png
index 24331a48c..24331a48c 100755
--- a/res/drawable-xhdpi/ic_action_play_over_video.png
+++ b/app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png
diff --git a/res/drawable-xhdpi/ic_drag_handle.png b/app/src/main/res/drawable-xhdpi/ic_drag_handle.png
index 5bdcac342..5bdcac342 100755
--- a/res/drawable-xhdpi/ic_drag_handle.png
+++ b/app/src/main/res/drawable-xhdpi/ic_drag_handle.png
diff --git a/res/drawable-xhdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-xhdpi/ic_drag_handle_dark.png
index d341c7c82..d341c7c82 100755
--- a/res/drawable-xhdpi/ic_drag_handle_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_drag_handle_dark.png
diff --git a/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
index a5fa74def..a5fa74def 100644
--- a/res/drawable-xhdpi/ic_drawer.png
+++ b/app/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/res/drawable-xhdpi/ic_drawer_dark.png b/app/src/main/res/drawable-xhdpi/ic_drawer_dark.png
index bcf49dd73..bcf49dd73 100644
--- a/res/drawable-xhdpi/ic_drawer_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_drawer_dark.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
index 857a1b12e..857a1b12e 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_new.png b/app/src/main/res/drawable-xhdpi/ic_new.png
index 447a9398b..447a9398b 100755
--- a/res/drawable-xhdpi/ic_new.png
+++ b/app/src/main/res/drawable-xhdpi/ic_new.png
diff --git a/res/drawable-xhdpi/ic_new_dark.png b/app/src/main/res/drawable-xhdpi/ic_new_dark.png
index 4a23d309c..4a23d309c 100755
--- a/res/drawable-xhdpi/ic_new_dark.png
+++ b/app/src/main/res/drawable-xhdpi/ic_new_dark.png
diff --git a/res/drawable-xhdpi/ic_stat_antenna.png b/app/src/main/res/drawable-xhdpi/ic_stat_antenna.png
index 50d73271d..50d73271d 100644
--- a/res/drawable-xhdpi/ic_stat_antenna.png
+++ b/app/src/main/res/drawable-xhdpi/ic_stat_antenna.png
diff --git a/res/drawable-xhdpi/ic_stat_authentication.png b/app/src/main/res/drawable-xhdpi/ic_stat_authentication.png
index 4adfb636c..4adfb636c 100755
--- a/res/drawable-xhdpi/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-xhdpi/ic_stat_authentication.png
diff --git a/res/drawable-xhdpi/ic_undobar_undo.png b/app/src/main/res/drawable-xhdpi/ic_undobar_undo.png
index 91c8429ad..91c8429ad 100644
--- a/res/drawable-xhdpi/ic_undobar_undo.png
+++ b/app/src/main/res/drawable-xhdpi/ic_undobar_undo.png
diff --git a/res/drawable-xhdpi/location_web_site.png b/app/src/main/res/drawable-xhdpi/location_web_site.png
index bd6b8682a..bd6b8682a 100644
--- a/res/drawable-xhdpi/location_web_site.png
+++ b/app/src/main/res/drawable-xhdpi/location_web_site.png
diff --git a/res/drawable-xhdpi/location_web_site_dark.png b/app/src/main/res/drawable-xhdpi/location_web_site_dark.png
index 9b77be967..9b77be967 100755
--- a/res/drawable-xhdpi/location_web_site_dark.png
+++ b/app/src/main/res/drawable-xhdpi/location_web_site_dark.png
diff --git a/res/drawable-xhdpi/navigation_accept.png b/app/src/main/res/drawable-xhdpi/navigation_accept.png
index b8915716e..b8915716e 100644
--- a/res/drawable-xhdpi/navigation_accept.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_accept.png
diff --git a/res/drawable-xhdpi/navigation_accept_dark.png b/app/src/main/res/drawable-xhdpi/navigation_accept_dark.png
index b52dc3701..b52dc3701 100755
--- a/res/drawable-xhdpi/navigation_accept_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_accept_dark.png
diff --git a/res/drawable-xhdpi/navigation_cancel.png b/app/src/main/res/drawable-xhdpi/navigation_cancel.png
index ca7d159fd..ca7d159fd 100644
--- a/res/drawable-xhdpi/navigation_cancel.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_cancel.png
diff --git a/res/drawable-xhdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-xhdpi/navigation_cancel_dark.png
index f391760ef..f391760ef 100755
--- a/res/drawable-xhdpi/navigation_cancel_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_cancel_dark.png
diff --git a/res/drawable-xhdpi/navigation_chapters.png b/app/src/main/res/drawable-xhdpi/navigation_chapters.png
index d527454c6..d527454c6 100755
--- a/res/drawable-xhdpi/navigation_chapters.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_chapters.png
diff --git a/res/drawable-xhdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-xhdpi/navigation_chapters_dark.png
index e53d5eb16..e53d5eb16 100755
--- a/res/drawable-xhdpi/navigation_chapters_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_chapters_dark.png
diff --git a/res/drawable-xhdpi/navigation_collapse.png b/app/src/main/res/drawable-xhdpi/navigation_collapse.png
index be6a7688c..be6a7688c 100755
--- a/res/drawable-xhdpi/navigation_collapse.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_collapse.png
diff --git a/res/drawable-xhdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-xhdpi/navigation_collapse_dark.png
index 2ed325108..2ed325108 100755
--- a/res/drawable-xhdpi/navigation_collapse_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_collapse_dark.png
diff --git a/res/drawable-xhdpi/navigation_expand.png b/app/src/main/res/drawable-xhdpi/navigation_expand.png
index 53c013b09..53c013b09 100644
--- a/res/drawable-xhdpi/navigation_expand.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_expand.png
diff --git a/res/drawable-xhdpi/navigation_expand_dark.png b/app/src/main/res/drawable-xhdpi/navigation_expand_dark.png
index 38c7b20d7..38c7b20d7 100755
--- a/res/drawable-xhdpi/navigation_expand_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_expand_dark.png
diff --git a/res/drawable-xhdpi/navigation_refresh.png b/app/src/main/res/drawable-xhdpi/navigation_refresh.png
index e6212cf67..e6212cf67 100644
--- a/res/drawable-xhdpi/navigation_refresh.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_refresh.png
diff --git a/res/drawable-xhdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-xhdpi/navigation_refresh_dark.png
index a7fdc0dfc..a7fdc0dfc 100755
--- a/res/drawable-xhdpi/navigation_refresh_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_refresh_dark.png
diff --git a/res/drawable-xhdpi/navigation_shownotes.png b/app/src/main/res/drawable-xhdpi/navigation_shownotes.png
index a0a156a94..a0a156a94 100755
--- a/res/drawable-xhdpi/navigation_shownotes.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_shownotes.png
diff --git a/res/drawable-xhdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png
index 95708234a..95708234a 100755
--- a/res/drawable-xhdpi/navigation_shownotes_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png
diff --git a/res/drawable-xhdpi/navigation_up.png b/app/src/main/res/drawable-xhdpi/navigation_up.png
index f8c3e6f75..f8c3e6f75 100755
--- a/res/drawable-xhdpi/navigation_up.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_up.png
diff --git a/res/drawable-xhdpi/navigation_up_dark.png b/app/src/main/res/drawable-xhdpi/navigation_up_dark.png
index 6964e069b..6964e069b 100755
--- a/res/drawable-xhdpi/navigation_up_dark.png
+++ b/app/src/main/res/drawable-xhdpi/navigation_up_dark.png
diff --git a/res/drawable-xhdpi/social_share.png b/app/src/main/res/drawable-xhdpi/social_share.png
index cdafd8abc..cdafd8abc 100644
--- a/res/drawable-xhdpi/social_share.png
+++ b/app/src/main/res/drawable-xhdpi/social_share.png
diff --git a/res/drawable-xhdpi/social_share_dark.png b/app/src/main/res/drawable-xhdpi/social_share_dark.png
index 15549b04e..15549b04e 100755
--- a/res/drawable-xhdpi/social_share_dark.png
+++ b/app/src/main/res/drawable-xhdpi/social_share_dark.png
diff --git a/res/drawable-xhdpi/spinner_button.9.png b/app/src/main/res/drawable-xhdpi/spinner_button.9.png
index 3dc481e54..3dc481e54 100644
--- a/res/drawable-xhdpi/spinner_button.9.png
+++ b/app/src/main/res/drawable-xhdpi/spinner_button.9.png
diff --git a/res/drawable-xhdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-xhdpi/spinner_button_dark.9.png
index c43293d5c..c43293d5c 100644
--- a/res/drawable-xhdpi/spinner_button_dark.9.png
+++ b/app/src/main/res/drawable-xhdpi/spinner_button_dark.9.png
diff --git a/res/drawable-xhdpi/stat_playlist.png b/app/src/main/res/drawable-xhdpi/stat_playlist.png
index 7977e6f2a..7977e6f2a 100644
--- a/res/drawable-xhdpi/stat_playlist.png
+++ b/app/src/main/res/drawable-xhdpi/stat_playlist.png
diff --git a/res/drawable-xhdpi/stat_playlist_dark.png b/app/src/main/res/drawable-xhdpi/stat_playlist_dark.png
index f32dd3780..f32dd3780 100644
--- a/res/drawable-xhdpi/stat_playlist_dark.png
+++ b/app/src/main/res/drawable-xhdpi/stat_playlist_dark.png
diff --git a/res/drawable-xhdpi/type_audio.png b/app/src/main/res/drawable-xhdpi/type_audio.png
index 777fab84e..777fab84e 100644
--- a/res/drawable-xhdpi/type_audio.png
+++ b/app/src/main/res/drawable-xhdpi/type_audio.png
diff --git a/res/drawable-xhdpi/type_audio_dark.png b/app/src/main/res/drawable-xhdpi/type_audio_dark.png
index dfd2b33c7..dfd2b33c7 100755
--- a/res/drawable-xhdpi/type_audio_dark.png
+++ b/app/src/main/res/drawable-xhdpi/type_audio_dark.png
diff --git a/res/drawable-xhdpi/type_video.png b/app/src/main/res/drawable-xhdpi/type_video.png
index bbd1f112f..bbd1f112f 100644
--- a/res/drawable-xhdpi/type_video.png
+++ b/app/src/main/res/drawable-xhdpi/type_video.png
diff --git a/res/drawable-xhdpi/type_video_dark.png b/app/src/main/res/drawable-xhdpi/type_video_dark.png
index a74947459..a74947459 100755
--- a/res/drawable-xhdpi/type_video_dark.png
+++ b/app/src/main/res/drawable-xhdpi/type_video_dark.png
diff --git a/res/drawable-xhdpi/undobar.9.png b/app/src/main/res/drawable-xhdpi/undobar.9.png
index 22fa2205b..22fa2205b 100644
--- a/res/drawable-xhdpi/undobar.9.png
+++ b/app/src/main/res/drawable-xhdpi/undobar.9.png
diff --git a/res/drawable-xhdpi/undobar_button_focused.9.png b/app/src/main/res/drawable-xhdpi/undobar_button_focused.9.png
index d284ca7cb..d284ca7cb 100644
--- a/res/drawable-xhdpi/undobar_button_focused.9.png
+++ b/app/src/main/res/drawable-xhdpi/undobar_button_focused.9.png
diff --git a/res/drawable-xhdpi/undobar_button_pressed.9.png b/app/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png
index e990659f0..e990659f0 100644
--- a/res/drawable-xhdpi/undobar_button_pressed.9.png
+++ b/app/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png
diff --git a/res/drawable-xhdpi/undobar_divider.9.png b/app/src/main/res/drawable-xhdpi/undobar_divider.9.png
index 1b067d4e7..1b067d4e7 100644
--- a/res/drawable-xhdpi/undobar_divider.9.png
+++ b/app/src/main/res/drawable-xhdpi/undobar_divider.9.png
diff --git a/res/drawable-xxhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
index 5a603b6bc..5a603b6bc 100644
--- a/res/drawable-xxhdpi/ic_action_overflow.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
diff --git a/res/drawable-xxhdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png
index e22049b1e..e22049b1e 100644
--- a/res/drawable-xxhdpi/ic_action_overflow_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png
index fa85601cf..fa85601cf 100755
--- a/res/drawable-xxhdpi/ic_action_pause_over_video.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png
diff --git a/res/drawable-xxhdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png
index 121be211e..121be211e 100755
--- a/res/drawable-xxhdpi/ic_action_play_over_video.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png
diff --git a/res/drawable-xxhdpi/ic_drag_handle.png b/app/src/main/res/drawable-xxhdpi/ic_drag_handle.png
index f834699c6..f834699c6 100755
--- a/res/drawable-xxhdpi/ic_drag_handle.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_handle.png
diff --git a/res/drawable-xxhdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-xxhdpi/ic_drag_handle_dark.png
index a9408bc9d..a9408bc9d 100755
--- a/res/drawable-xxhdpi/ic_drag_handle_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_drag_handle_dark.png
diff --git a/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
index 9c4685d6e..9c4685d6e 100644
--- a/res/drawable-xxhdpi/ic_drawer.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
diff --git a/res/drawable-xxhdpi/ic_drawer_dark.png b/app/src/main/res/drawable-xxhdpi/ic_drawer_dark.png
index f7e3b3079..f7e3b3079 100644
--- a/res/drawable-xxhdpi/ic_drawer_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_drawer_dark.png
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
index 2bef52ec7..2bef52ec7 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/res/drawable-xxhdpi/ic_new.png b/app/src/main/res/drawable-xxhdpi/ic_new.png
index 5e836eae4..5e836eae4 100755
--- a/res/drawable-xxhdpi/ic_new.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_new.png
diff --git a/res/drawable-xxhdpi/ic_new_dark.png b/app/src/main/res/drawable-xxhdpi/ic_new_dark.png
index bca96b751..bca96b751 100755
--- a/res/drawable-xxhdpi/ic_new_dark.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_new_dark.png
diff --git a/res/drawable-xxhdpi/ic_stat_authentication.png b/app/src/main/res/drawable-xxhdpi/ic_stat_authentication.png
index b274bb60f..b274bb60f 100755
--- a/res/drawable-xxhdpi/ic_stat_authentication.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_stat_authentication.png
diff --git a/res/drawable/badge.xml b/app/src/main/res/drawable/badge.xml
index f98384cb9..f98384cb9 100644
--- a/res/drawable/badge.xml
+++ b/app/src/main/res/drawable/badge.xml
diff --git a/res/drawable/borderless_button.xml b/app/src/main/res/drawable/borderless_button.xml
index 27d723eed..27d723eed 100644
--- a/res/drawable/borderless_button.xml
+++ b/app/src/main/res/drawable/borderless_button.xml
diff --git a/res/drawable/borderless_button_dark.xml b/app/src/main/res/drawable/borderless_button_dark.xml
index 6d263938d..6d263938d 100644
--- a/res/drawable/borderless_button_dark.xml
+++ b/app/src/main/res/drawable/borderless_button_dark.xml
diff --git a/res/drawable/horizontal_divider.9.png b/app/src/main/res/drawable/horizontal_divider.9.png
index 7db0549da..7db0549da 100644
--- a/res/drawable/horizontal_divider.9.png
+++ b/app/src/main/res/drawable/horizontal_divider.9.png
diff --git a/res/drawable/overlay_button_circle_background.xml b/app/src/main/res/drawable/overlay_button_circle_background.xml
index 90c51472c..90c51472c 100644
--- a/res/drawable/overlay_button_circle_background.xml
+++ b/app/src/main/res/drawable/overlay_button_circle_background.xml
diff --git a/res/drawable/overlay_drawable.xml b/app/src/main/res/drawable/overlay_drawable.xml
index 185ffefc1..185ffefc1 100644
--- a/res/drawable/overlay_drawable.xml
+++ b/app/src/main/res/drawable/overlay_drawable.xml
diff --git a/res/drawable/overlay_drawable_dark.xml b/app/src/main/res/drawable/overlay_drawable_dark.xml
index fb78f5633..fb78f5633 100644
--- a/res/drawable/overlay_drawable_dark.xml
+++ b/app/src/main/res/drawable/overlay_drawable_dark.xml
diff --git a/res/drawable/type_audio.png b/app/src/main/res/drawable/type_audio.png
index 4ec9efd97..4ec9efd97 100644
--- a/res/drawable/type_audio.png
+++ b/app/src/main/res/drawable/type_audio.png
diff --git a/res/drawable/type_video.png b/app/src/main/res/drawable/type_video.png
index a2722b812..a2722b812 100644
--- a/res/drawable/type_video.png
+++ b/app/src/main/res/drawable/type_video.png
diff --git a/res/drawable/undobar_button.xml b/app/src/main/res/drawable/undobar_button.xml
index a4de91b49..a4de91b49 100644
--- a/res/drawable/undobar_button.xml
+++ b/app/src/main/res/drawable/undobar_button.xml
diff --git a/res/drawable/vertical_divider.9.png b/app/src/main/res/drawable/vertical_divider.9.png
index 6a0edafb3..6a0edafb3 100644
--- a/res/drawable/vertical_divider.9.png
+++ b/app/src/main/res/drawable/vertical_divider.9.png
diff --git a/res/drawable/white_circle.xml b/app/src/main/res/drawable/white_circle.xml
index 597b70a2d..597b70a2d 100644
--- a/res/drawable/white_circle.xml
+++ b/app/src/main/res/drawable/white_circle.xml
diff --git a/res/layout-land/audioplayer_activity.xml b/app/src/main/res/layout-land/audioplayer_activity.xml
index 8f8fdbee3..8f8fdbee3 100644
--- a/res/layout-land/audioplayer_activity.xml
+++ b/app/src/main/res/layout-land/audioplayer_activity.xml
diff --git a/res/layout-land/videoplayer_activity.xml b/app/src/main/res/layout-land/videoplayer_activity.xml
index f1e54f7c3..f1e54f7c3 100644
--- a/res/layout-land/videoplayer_activity.xml
+++ b/app/src/main/res/layout-land/videoplayer_activity.xml
diff --git a/res/layout-v14/authentication_dialog.xml b/app/src/main/res/layout-v14/authentication_dialog.xml
index ed05dab1c..ed05dab1c 100644
--- a/res/layout-v14/authentication_dialog.xml
+++ b/app/src/main/res/layout-v14/authentication_dialog.xml
diff --git a/res/layout-v14/directory_chooser.xml b/app/src/main/res/layout-v14/directory_chooser.xml
index f0bef72e4..f0bef72e4 100644
--- a/res/layout-v14/directory_chooser.xml
+++ b/app/src/main/res/layout-v14/directory_chooser.xml
diff --git a/res/layout-v14/download_authentication_activity.xml b/app/src/main/res/layout-v14/download_authentication_activity.xml
index c1fe55ceb..c1fe55ceb 100644
--- a/res/layout-v14/download_authentication_activity.xml
+++ b/app/src/main/res/layout-v14/download_authentication_activity.xml
diff --git a/res/layout-v14/opml_selection.xml b/app/src/main/res/layout-v14/opml_selection.xml
index 3133debd1..3133debd1 100644
--- a/res/layout-v14/opml_selection.xml
+++ b/app/src/main/res/layout-v14/opml_selection.xml
diff --git a/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml
index 7fd4309d5..7fd4309d5 100644
--- a/res/layout-v14/time_dialog.xml
+++ b/app/src/main/res/layout-v14/time_dialog.xml
diff --git a/res/layout/about.xml b/app/src/main/res/layout/about.xml
index acde9d786..acde9d786 100644
--- a/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
diff --git a/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index 09502eb7b..09502eb7b 100644
--- a/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
diff --git a/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml
index a879aad55..a879aad55 100644
--- a/res/layout/audioplayer_activity.xml
+++ b/app/src/main/res/layout/audioplayer_activity.xml
diff --git a/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml
index 82260eb43..82260eb43 100644
--- a/res/layout/authentication_dialog.xml
+++ b/app/src/main/res/layout/authentication_dialog.xml
diff --git a/res/layout/autoflattr_preference_dialog.xml b/app/src/main/res/layout/autoflattr_preference_dialog.xml
index fc2df30d7..fc2df30d7 100644
--- a/res/layout/autoflattr_preference_dialog.xml
+++ b/app/src/main/res/layout/autoflattr_preference_dialog.xml
diff --git a/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index f9c88ac02..f9c88ac02 100644
--- a/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
diff --git a/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml
index 738c00842..738c00842 100644
--- a/res/layout/directory_chooser.xml
+++ b/app/src/main/res/layout/directory_chooser.xml
diff --git a/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml
index 69106c9b3..69106c9b3 100644
--- a/res/layout/download_authentication_activity.xml
+++ b/app/src/main/res/layout/download_authentication_activity.xml
diff --git a/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml
index 97003ce65..97003ce65 100644
--- a/res/layout/downloaded_episodeslist_item.xml
+++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml
diff --git a/res/layout/downloadlist_item.xml b/app/src/main/res/layout/downloadlist_item.xml
index 49e0ea471..49e0ea471 100644
--- a/res/layout/downloadlist_item.xml
+++ b/app/src/main/res/layout/downloadlist_item.xml
diff --git a/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml
index 22d669097..22d669097 100644
--- a/res/layout/downloadlog_item.xml
+++ b/app/src/main/res/layout/downloadlog_item.xml
diff --git a/res/layout/ellipsize_start_listitem.xml b/app/src/main/res/layout/ellipsize_start_listitem.xml
index 161e1aa37..161e1aa37 100644
--- a/res/layout/ellipsize_start_listitem.xml
+++ b/app/src/main/res/layout/ellipsize_start_listitem.xml
diff --git a/res/layout/external_itemlist_item.xml b/app/src/main/res/layout/external_itemlist_item.xml
index 20c63c2cf..20c63c2cf 100644
--- a/res/layout/external_itemlist_item.xml
+++ b/app/src/main/res/layout/external_itemlist_item.xml
diff --git a/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml
index f084ccac1..f084ccac1 100644
--- a/res/layout/external_player_fragment.xml
+++ b/app/src/main/res/layout/external_player_fragment.xml
diff --git a/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index 6da200951..6da200951 100644
--- a/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
diff --git a/res/layout/feeditem_dialog.xml b/app/src/main/res/layout/feeditem_dialog.xml
index c8dca8460..c8dca8460 100644
--- a/res/layout/feeditem_dialog.xml
+++ b/app/src/main/res/layout/feeditem_dialog.xml
diff --git a/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 83c189bb5..83c189bb5 100644
--- a/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
diff --git a/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index f3701de2c..f3701de2c 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
diff --git a/res/layout/flattr_auth.xml b/app/src/main/res/layout/flattr_auth.xml
index 9244b786d..9244b786d 100644
--- a/res/layout/flattr_auth.xml
+++ b/app/src/main/res/layout/flattr_auth.xml
diff --git a/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml
index 0112754ee..0112754ee 100644
--- a/res/layout/gpodnet_podcast_list.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_list.xml
diff --git a/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 1f6cdd1d0..1f6cdd1d0 100644
--- a/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
diff --git a/res/layout/gpodnetauth_activity.xml b/app/src/main/res/layout/gpodnetauth_activity.xml
index c096c20cf..c096c20cf 100644
--- a/res/layout/gpodnetauth_activity.xml
+++ b/app/src/main/res/layout/gpodnetauth_activity.xml
diff --git a/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml
index 3e3c4e54f..3e3c4e54f 100644
--- a/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
diff --git a/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml
index 33d3d2718..33d3d2718 100644
--- a/res/layout/gpodnetauth_device.xml
+++ b/app/src/main/res/layout/gpodnetauth_device.xml
diff --git a/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml
index 71873201a..71873201a 100644
--- a/res/layout/gpodnetauth_finish.xml
+++ b/app/src/main/res/layout/gpodnetauth_finish.xml
diff --git a/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml
index d6a3f6a16..d6a3f6a16 100644
--- a/res/layout/itemdescription_listitem.xml
+++ b/app/src/main/res/layout/itemdescription_listitem.xml
diff --git a/res/layout/listview_activity.xml b/app/src/main/res/layout/listview_activity.xml
index b276f506c..b276f506c 100644
--- a/res/layout/listview_activity.xml
+++ b/app/src/main/res/layout/listview_activity.xml
diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml
index cfd59b87c..cfd59b87c 100644
--- a/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
diff --git a/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index d94c9ada1..d94c9ada1 100644
--- a/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
diff --git a/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index 9d70e7d7c..9d70e7d7c 100644
--- a/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
diff --git a/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml
index 1f2fc7e3e..1f2fc7e3e 100644
--- a/res/layout/nav_section_item.xml
+++ b/app/src/main/res/layout/nav_section_item.xml
diff --git a/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml
index 63c712f57..63c712f57 100644
--- a/res/layout/new_episodes_fragment.xml
+++ b/app/src/main/res/layout/new_episodes_fragment.xml
diff --git a/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index dcef1f8fc..dcef1f8fc 100644
--- a/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
diff --git a/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml
index 11ae1f644..11ae1f644 100644
--- a/res/layout/onlinefeedview_header.xml
+++ b/app/src/main/res/layout/onlinefeedview_header.xml
diff --git a/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml
index 919e30551..919e30551 100644
--- a/res/layout/opml_import.xml
+++ b/app/src/main/res/layout/opml_import.xml
diff --git a/res/layout/opml_selection.xml b/app/src/main/res/layout/opml_selection.xml
index d08ebd0bd..d08ebd0bd 100644
--- a/res/layout/opml_selection.xml
+++ b/app/src/main/res/layout/opml_selection.xml
diff --git a/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml
index cb7ae0151..cb7ae0151 100644
--- a/res/layout/pager_fragment.xml
+++ b/app/src/main/res/layout/pager_fragment.xml
diff --git a/res/layout/player_widget.xml b/app/src/main/res/layout/player_widget.xml
index b6946f7a8..b6946f7a8 100644
--- a/res/layout/player_widget.xml
+++ b/app/src/main/res/layout/player_widget.xml
diff --git a/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index 742411761..742411761 100644
--- a/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
diff --git a/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 4a55cd466..4a55cd466 100644
--- a/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
diff --git a/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index b057a966d..b057a966d 100644
--- a/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
diff --git a/res/layout/simplechapter_item.xml b/app/src/main/res/layout/simplechapter_item.xml
index 422458d5d..422458d5d 100644
--- a/res/layout/simplechapter_item.xml
+++ b/app/src/main/res/layout/simplechapter_item.xml
diff --git a/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml
index c1ee77262..c1ee77262 100644
--- a/res/layout/storage_error.xml
+++ b/app/src/main/res/layout/storage_error.xml
diff --git a/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index 95cc9a5a7..95cc9a5a7 100644
--- a/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
diff --git a/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml
index 7735ffd2c..7735ffd2c 100644
--- a/res/menu/directory_chooser.xml
+++ b/app/src/main/res/menu/directory_chooser.xml
diff --git a/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index be50cb87d..be50cb87d 100644
--- a/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
diff --git a/res/menu/feeditem.xml b/app/src/main/res/menu/feeditem.xml
index 5b25e8f2c..5b25e8f2c 100644
--- a/res/menu/feeditem.xml
+++ b/app/src/main/res/menu/feeditem.xml
diff --git a/res/menu/feeditem_dialog.xml b/app/src/main/res/menu/feeditem_dialog.xml
index f33b7502a..f33b7502a 100644
--- a/res/menu/feeditem_dialog.xml
+++ b/app/src/main/res/menu/feeditem_dialog.xml
diff --git a/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index f8eb7232e..f8eb7232e 100644
--- a/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml
index c5b069b40..c5b069b40 100644
--- a/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
diff --git a/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 0eb2ab067..0eb2ab067 100644
--- a/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
diff --git a/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml
index 4cf3b5fec..4cf3b5fec 100644
--- a/res/menu/new_episodes.xml
+++ b/app/src/main/res/menu/new_episodes.xml
diff --git a/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 327600038..327600038 100644
--- a/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
diff --git a/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index adb983e9e..adb983e9e 100644
--- a/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index ae2addb05..ae2addb05 100644
--- a/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
diff --git a/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 8792d1fc9..8792d1fc9 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5c41b6eb0..5c41b6eb0 100644
--- a/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 539470a5e..539470a5e 100644
--- a/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
diff --git a/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index cd4949530..cd4949530 100644
--- a/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1b87e6dbc..1b87e6dbc 100644
--- a/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index afc441b99..afc441b99 100644
--- a/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
diff --git a/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 43590f62a..43590f62a 100644
--- a/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
diff --git a/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 9bc81c269..9bc81c269 100644
--- a/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
diff --git a/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 27f4b969d..27f4b969d 100644
--- a/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4d783b83a..4d783b83a 100644
--- a/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
diff --git a/res/values-land/styles.xml b/app/src/main/res/values-land/styles.xml
index d964ef3d4..d964ef3d4 100644
--- a/res/values-land/styles.xml
+++ b/app/src/main/res/values-land/styles.xml
diff --git a/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index 27b4868c7..27b4868c7 100644
--- a/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a0c852059..a0c852059 100644
--- a/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
diff --git a/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index fc56ab6bf..fc56ab6bf 100644
--- a/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 62fd9c046..62fd9c046 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
diff --git a/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f1e525384..f1e525384 100644
--- a/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
diff --git a/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index a6e782f74..a6e782f74 100644
--- a/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c5c642da0..c5c642da0 100644
--- a/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
diff --git a/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index e17f54fa5..e17f54fa5 100644
--- a/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
diff --git a/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 6653e6614..6653e6614 100644
--- a/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
diff --git a/res/values-v11/colors.xml b/app/src/main/res/values-v11/colors.xml
index 520efaa06..520efaa06 100644
--- a/res/values-v11/colors.xml
+++ b/app/src/main/res/values-v11/colors.xml
diff --git a/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml
index 090a476a8..090a476a8 100644
--- a/res/values-v14/dimens.xml
+++ b/app/src/main/res/values-v14/dimens.xml
diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
index 6a39d6175..6a39d6175 100644
--- a/res/values-v14/styles.xml
+++ b/app/src/main/res/values-v14/styles.xml
diff --git a/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml
index e7c56b5f5..e7c56b5f5 100644
--- a/res/values-v16/styles.xml
+++ b/app/src/main/res/values-v16/styles.xml
diff --git a/res/values-v19/colors.xml b/app/src/main/res/values-v19/colors.xml
index 16c065d75..16c065d75 100644
--- a/res/values-v19/colors.xml
+++ b/app/src/main/res/values-v19/colors.xml
diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 63320b851..63320b851 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f09c76080..f09c76080 100644
--- a/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 08a8063c1..08a8063c1 100644
--- a/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6b535079d..6b535079d 100644
--- a/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1ebcdb76d..1ebcdb76d 100644
--- a/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
diff --git a/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 90e405fde..90e405fde 100644
--- a/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
diff --git a/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 33501d9fb..33501d9fb 100644
--- a/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5cc4ee86..b5cc4ee86 100644
--- a/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e42072afa..e42072afa 100644
--- a/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
diff --git a/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml
index 831f6daf0..831f6daf0 100644
--- a/res/xml/player_widget_info.xml
+++ b/app/src/main/res/xml/player_widget_info.xml
diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 470e1a1fe..470e1a1fe 100644
--- a/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
diff --git a/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index ee73aca8d..ee73aca8d 100644
--- a/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
diff --git a/build.gradle b/build.gradle
index 441b17385..48f4e4684 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,129 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-apply plugin: 'com.android.application'
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    def libsdir = new File('libs');
-    if (!libsdir.exists()) {
-        println "Creating libs directory"
-        libsdir.mkdir()
-    }
-    compile 'com.android.support:support-v4:19.1.+'
-    compile 'com.android.support:appcompat-v7:19.1.+'
-    compile 'org.apache.commons:commons-lang3:3.3.2'
-    compile ('org.shredzone.flattr4j:flattr4j-core:2.10') {
-        exclude group: 'org.apache.httpcomponents', module: 'httpcore'
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-        exclude group: 'org.json', module: 'json'
-    }
-    compile 'commons-io:commons-io:2.4'
-    compile 'com.nineoldandroids:library:2.4.0'
-    compile project(':submodules:dslv:library')
+        classpath 'com.android.tools.build:gradle:0.12.2'
 
-    compile 'com.jayway.android.robotium:robotium-solo:5.2.1'
-    compile ("com.doomonafireball.betterpickers:library:1.5.2") {
-        exclude group: 'com.android.support', module: 'support-v4'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
-    compile 'org.jsoup:jsoup:1.7.3'
-    compile 'com.squareup.picasso:picasso:2.3.+'
-    compile 'com.squareup.okhttp:okhttp:2.0.+'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'
-    compile 'com.squareup.okio:okio:1.0.0'
 }
 
-android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0"
-
-    defaultConfig {
-        minSdkVersion 10
-        targetSdkVersion 19
-        testApplicationId "de.test.antennapod"
-        testInstrumentationRunner "instrumentationTest.de.test.antennapod.AntennaPodTestRunner"
-    }
-
-    signingConfigs {
-        releaseConfig {
-            if (project.hasProperty('releaseStoreFile')) {
-                storeFile file(releaseStoreFile)
-            } else {
-                storeFile file('keystore')
-            }
-            if (project.hasProperty('releaseStorePassword')) {
-                storePassword releaseStorePassword
-            } else {
-                storePassword "password"
-            }
-            if (project.hasProperty('releaseKeyAlias')) {
-                keyAlias releaseKeyAlias
-            } else {
-                keyAlias "alias"
-            }
-            if (project.hasProperty('releaseKeyPassword')) {
-                keyPassword releaseKeyPassword
-            } else {
-                keyPassword "password"
-            }
-        }
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-    }
-
-    buildTypes {
-        def STRING = "String"
-        def FLATTR_APP_KEY = "FLATTR_APP_KEY"
-        def FLATTR_APP_SECRET = "FLATTR_APP_SECRET"
-        def mFlattrAppKey = (project.hasProperty('flattrAppKey')) ? flattrAppKey : "\"\""
-        def mFlattrAppSecret = (project.hasProperty('flattrAppSecret')) ? flattrAppSecret : "\"\""
-
-        debug {
-            applicationIdSuffix ".debug"
-            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
-            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
-        }
-        release {
-            runProguard true
-            proguardFile 'proguard.cfg'
-            signingConfig signingConfigs.releaseConfig
-            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
-            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+allprojects {
+    repositories {
+        jcenter()
     }
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
-}
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6de43d84c..d33586960 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-include ':submodules:dslv:library'
+include ':app'
+include ':app:dslv:library'
diff --git a/tests/.classpath b/tests/.classpath
deleted file mode 100644
index 62d428f2b..000000000
--- a/tests/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/AntennaPod"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/tests/.project b/tests/.project
deleted file mode 100644
index 22c678688..000000000
--- a/tests/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AntennaPodTest</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
deleted file mode 100644
index d2d661e83..000000000
--- a/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.danoeh.antennapod.test"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="10" />
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="de.danoeh.antennapod" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/tests/lint.xml b/tests/lint.xml
deleted file mode 100644
index ee0eead5b..000000000
--- a/tests/lint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-</lint>
\ No newline at end of file
diff --git a/tests/proguard-project.txt b/tests/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/tests/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/tests/project.properties b/tests/project.properties
deleted file mode 100644
index 0840b4a05..000000000
--- a/tests/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-15
diff --git a/tests/res/drawable-hdpi/ic_launcher.png b/tests/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b..000000000
--- a/tests/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/tests/res/drawable-ldpi/ic_launcher.png b/tests/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 99238729d..000000000
--- a/tests/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
diff --git a/tests/res/drawable-mdpi/ic_launcher.png b/tests/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa..000000000
--- a/tests/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/tests/res/drawable-xhdpi/ic_launcher.png b/tests/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f..000000000
--- a/tests/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
deleted file mode 100644
index 8f0a2c82b..000000000
--- a/tests/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">AntennapodTestTest</string>
-
-</resources>
\ No newline at end of file