diff --git a/app/build.gradle b/app/build.gradle
index 2cc0bab75..b62b2af67 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,9 +113,6 @@ dependencies {
     compile 'eu.davidea:flexible-adapter:4.2.0@aar'
     compile 'com.nononsenseapps:filepicker:2.5.0'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'rapid.decoder:library:0.3.0'
-    compile 'rapid.decoder:jpeg-decoder:0.3.0'
-    compile 'rapid.decoder:png-decoder:0.3.0'
 
     compile "com.google.dagger:dagger:$DAGGER_VERSION"
     apt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java
index fd725d3a1..a0eee82bf 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/reader/viewer/base/BaseReader.java
@@ -3,6 +3,7 @@ package eu.kanade.mangafeed.ui.reader.viewer.base;
 import android.view.MotionEvent;
 
 import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder;
+import com.davemorrissey.labs.subscaleview.decoder.RapidImageRegionDecoder;
 import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder;
 
 import java.util.List;
@@ -10,7 +11,6 @@ import java.util.List;
 import eu.kanade.mangafeed.data.source.model.Page;
 import eu.kanade.mangafeed.ui.base.fragment.BaseFragment;
 import eu.kanade.mangafeed.ui.reader.ReaderActivity;
-import eu.kanade.mangafeed.ui.reader.decoder.RapidImageRegionDecoder;
 
 public abstract class BaseReader extends BaseFragment {
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea57c59cf..bc66e09d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,12 +59,12 @@
     <string name="pref_category_about">About</string>
 
       <!-- General section -->
-    <string name="pref_library_columns">Library mangas per row</string>
+    <string name="pref_library_columns">Library manga per row</string>
     <string name="portrait">Portrait</string>
     <string name="landscape">Landscape</string>
     <string name="default_columns">Default</string>
     <string name="pref_library_update_interval">Library update period</string>
-    <string name="pref_update_only_non_completed">Update only non completed mangas</string>
+    <string name="pref_update_only_non_completed">Update only non completed manga</string>
     <string name="update_never">Manual</string>
     <string name="update_1hour">Hourly</string>
     <string name="update_2hour">Every 2 hours</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 230f34198..62f661020 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,7 +5,6 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="alertDialogTheme">@style/AlertDialogStyle</item>
-        <item name="android:itemTextAppearance">@style/OptionsMenuTextColor</item>
         <item name="android:textColor">@color/primary_text</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
@@ -32,10 +31,6 @@
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
     </style>
 
-    <style name="OptionsMenuTextColor" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
     <style name="ActionBarSpinner" parent="@style/Widget.AppCompat.TextView.SpinnerItem">
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorHint">@color/hint_foreground_material_dark</item>
diff --git a/libs/SubsamplingScaleImageView/build.gradle b/libs/SubsamplingScaleImageView/build.gradle
index 4c762aee3..abdacff13 100644
--- a/libs/SubsamplingScaleImageView/build.gradle
+++ b/libs/SubsamplingScaleImageView/build.gradle
@@ -6,6 +6,9 @@ version = '3.4.1'
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile "com.android.support:support-annotations:23.1.1"
+    compile 'rapid.decoder:library:0.3.0'
+    compile 'rapid.decoder:jpeg-decoder:0.3.0'
+    compile 'rapid.decoder:png-decoder:0.3.0'
 }
 
 android {
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/reader/decoder/RapidImageRegionDecoder.java b/libs/SubsamplingScaleImageView/src/com/davemorrissey/labs/subscaleview/decoder/RapidImageRegionDecoder.java
similarity index 96%
rename from app/src/main/java/eu/kanade/mangafeed/ui/reader/decoder/RapidImageRegionDecoder.java
rename to libs/SubsamplingScaleImageView/src/com/davemorrissey/labs/subscaleview/decoder/RapidImageRegionDecoder.java
index 1c1e3bb56..52b4b86b3 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/reader/decoder/RapidImageRegionDecoder.java
+++ b/libs/SubsamplingScaleImageView/src/com/davemorrissey/labs/subscaleview/decoder/RapidImageRegionDecoder.java
@@ -1,4 +1,4 @@
-package eu.kanade.mangafeed.ui.reader.decoder;
+package com.davemorrissey.labs.subscaleview.decoder;
 
 import android.content.Context;
 import android.graphics.Bitmap;