diff --git a/app/build.gradle b/app/build.gradle
index 22b0cb32..3e89689a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "ru.noties.markwon:core:${markwonVersion}"
     implementation 'com.github.clans:fab:1.6.4'
+    implementation('com.finotes:finotescore:2.5.7@aar') {
+        transitive = true
+    }
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb434..efb4fd24 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,4 +18,11 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+-keep class com.finotes.android.finotescore.* { *; }
+
+-keepclassmembers class * {
+    @com.finotes.android.finotescore.annotation.Observe *;
+}
+
+-keepattributes SourceFile,LineNumberTable
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e380367..8a646c94 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name=".Pupil">
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
new file mode 100644
index 00000000..bf5d8b3b
--- /dev/null
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -0,0 +1,22 @@
+package xyz.quaver.pupil
+
+import android.content.Intent
+import android.os.Process
+import com.finotes.android.finotescore.Fn
+import com.finotes.android.finotescore.ObservableApplication
+import com.finotes.android.finotescore.Severity
+
+class Pupil : ObservableApplication() {
+
+    override fun onCreate() {
+        super.onCreate()
+        Fn.init(this)
+
+        Fn.enableFrameDetection()
+
+        Thread.setDefaultUncaughtExceptionHandler { t, e ->
+            Fn.reportException(t, Exception(e), Severity.FATAL)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
index 7ba74574..91e54659 100644
--- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
@@ -14,6 +14,7 @@ import kotlinx.android.synthetic.main.activity_reader.*
 import kotlinx.android.synthetic.main.activity_reader.view.*
 import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
 import kotlinx.coroutines.*
+import kotlinx.io.IOException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
@@ -148,7 +149,6 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        loadJob?.cancel()
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/xyz/quaver/pupil/util/history.kt b/app/src/main/java/xyz/quaver/pupil/util/history.kt
index 7ddf2551..b0ad4395 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/history.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/history.kt
@@ -1,5 +1,6 @@
 package xyz.quaver.pupil.util
 
+import kotlinx.io.IOException
 import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
diff --git a/app/src/main/java/xyz/quaver/pupil/util/progress.kt b/app/src/main/java/xyz/quaver/pupil/util/progress.kt
new file mode 100644
index 00000000..554cfe05
--- /dev/null
+++ b/app/src/main/java/xyz/quaver/pupil/util/progress.kt
@@ -0,0 +1,2 @@
+package xyz.quaver.pupil.util
+
diff --git a/app/src/main/java/xyz/quaver/pupil/util/update.kt b/app/src/main/java/xyz/quaver/pupil/util/update.kt
index 2c951cbe..198c82a2 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -1,5 +1,6 @@
 package xyz.quaver.pupil.util
 
+import kotlinx.io.IOException
 import kotlinx.serialization.json.*
 import java.net.URL
 
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index edc95288..0e0c6bd7 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -49,6 +49,11 @@
             app:fab_label="@string/reader_fab_fullscreen"
             app:fab_size="mini"/>
 
+        <com.github.clans.fab.FloatingActionButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_size="mini"/>
+
     </com.github.clans.fab.FloatingActionMenu>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9b93e54a..2853a5c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,13 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven {
+            url "s3://finotescore-android/release"
+            credentials(AwsCredentials) {
+                accessKey = "AKIAJ7TPIN63PV5SWK3A"
+                secretKey = "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"
+            }
+        }
     }
 }
 
diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/readers.kt b/libpupil/src/main/java/xyz/quaver/hitomi/readers.kt
index 36b9811d..0be173e9 100644
--- a/libpupil/src/main/java/xyz/quaver/hitomi/readers.kt
+++ b/libpupil/src/main/java/xyz/quaver/hitomi/readers.kt
@@ -28,7 +28,6 @@ fun getReader(galleryID: Int) : Reader {
     val galleryInfoUrl = "https://ltn.hitomi.la/galleries/$galleryID.js"
 
     try {
-
         val doc = Jsoup.connect(readerUrl).get()
 
         val images = doc.select(".img-url").map {
diff --git a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt
index 2f201385..003b0c55 100644
--- a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt
+++ b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt
@@ -1,5 +1,6 @@
 package xyz.quaver.hiyobi
 
+import kotlinx.io.IOException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.json.content