diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/Utilities.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/Utilities.kt
index 7c68365201..540e23282e 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/Utilities.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/Utilities.kt
@@ -333,15 +333,6 @@ object Utilities {
             return if (activeNetwork != null) activeNetwork.type == ConnectivityManager.TYPE_WIFI || activeNetwork.type == ConnectivityManager.TYPE_MOBILE else false
         }//TODO: Check this also, this doesn't seem to be a nice way to do things.
 
-    /**
-     * Is reader in night mode
-     *
-     * @return true if so, otherwise false
-     */
-    val isReaderNightMode: Boolean
-        get() =//TODO: Check this also, this doesn't seem to be a nice way to do things.
-            Settings.ReaderTextColor == Color.WHITE
-
 
     fun setNightNode() {
         setReaderColor(Color.WHITE, Color.BLACK)
@@ -387,17 +378,6 @@ object Utilities {
         }
     }
 
-    /**
-     * Swaps the reader colors
-     */
-    fun swapReaderColor() {
-        if (isReaderNightMode) {
-            setReaderColor(Color.BLACK, Color.WHITE)
-        } else {
-            setReaderColor(Color.WHITE, Color.BLACK)
-        }
-    }
-
     /**
      * Toggles bookmark
      *
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/Database.java b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/Database.java
index 13c4235f1a..6e2f08df21 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/Database.java
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/Database.java
@@ -706,6 +706,7 @@ public static String getSavedNovelPassage(int chapterID) {
          * @param chapterURL chapter url
          * @return if present
          */
+        @SuppressWarnings("BooleanMethodIsAlwaysInverted")
         public static boolean isNotInChapters(@NonNull String chapterURL) {
             Cursor cursor = sqLiteDatabase.rawQuery("SELECT " + Columns.IS_SAVED + " from " + Tables.CHAPTERS + " where " + Columns.ID + " =" + DatabaseIdentification.getChapterIDFromChapterURL(chapterURL), null);
             int a = cursor.getCount();
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/objects/base/Base.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/objects/base/Base.kt
deleted file mode 100644
index c18dd57e64..0000000000
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/backend/database/objects/base/Base.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.doomsdayrs.apps.shosetsu.backend.database.objects.base
-
-import java.io.Serializable
-
-/*
- * This file is part of Shosetsu.
- *
- * Shosetsu is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Shosetsu is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Shosetsu.  If not, see <https://www.gnu.org/licenses/>.
- * ====================================================================
- * shosetsu
- * 27 / 07 / 2019
- *
- * @author github.com/doomsdayrs
- */
-open class Base internal constructor(val NOVEL_URL: String) : Serializable {
-    override fun toString(): String {
-        return "Base{" +
-                "NOVEL_URL='" + NOVEL_URL + '\'' +
-                '}'
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/catalogue/listeners/CatalogueSearchQuery.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/catalogue/listeners/CatalogueSearchQuery.kt
index f2ca7d9f04..b0634f5ab3 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/catalogue/listeners/CatalogueSearchQuery.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/catalogue/listeners/CatalogueSearchQuery.kt
@@ -51,10 +51,10 @@ class CatalogueSearchQuery(private val catalogueFragment: CatalogueFragment) : S
         catalogueFragment.isQuery = true
         val recycleCards = ArrayList(catalogueFragment.catalogueNovelCards)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            recycleCards.removeIf { recycleCard: CatalogueNovelCard? -> !recycleCard!!.title.toLowerCase().contains(newText.toLowerCase()) }
+            recycleCards.removeIf { recycleCard: CatalogueNovelCard? -> !recycleCard!!.title.toLowerCase(Locale.ROOT).contains(newText.toLowerCase(Locale.ROOT)) }
         } else {
             for (x in recycleCards.indices.reversed()) {
-                if (!recycleCards[x]!!.title.toLowerCase().contains(newText.toLowerCase())) {
+                if (!recycleCards[x]!!.title.toLowerCase(Locale.ROOT).contains(newText.toLowerCase(Locale.ROOT))) {
                     recycleCards.removeAt(x)
                 }
             }
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/novel/NovelFragment.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/novel/NovelFragment.kt
index 7068541c74..b525d86966 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/novel/NovelFragment.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/novel/NovelFragment.kt
@@ -8,13 +8,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import com.github.doomsdayrs.api.shosetsu.services.core.dep.Formatter
-import com.github.doomsdayrs.api.shosetsu.services.core.objects.Novel
 import com.github.doomsdayrs.api.shosetsu.services.core.objects.NovelChapter
 import com.github.doomsdayrs.api.shosetsu.services.core.objects.NovelPage
 import com.github.doomsdayrs.apps.shosetsu.R
 import com.github.doomsdayrs.apps.shosetsu.backend.Utilities
 import com.github.doomsdayrs.apps.shosetsu.backend.database.Database
-import com.github.doomsdayrs.apps.shosetsu.backend.database.Database.DatabaseChapter
 import com.github.doomsdayrs.apps.shosetsu.backend.database.Database.DatabaseChapter.getChapter
 import com.github.doomsdayrs.apps.shosetsu.backend.database.Database.DatabaseChapter.getStatus
 import com.github.doomsdayrs.apps.shosetsu.backend.database.Database.DatabaseIdentification.getChapterIDFromChapterURL
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/SearchFragment.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/SearchFragment.kt
index 6d4330b0aa..08b099329d 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/SearchFragment.kt
@@ -6,7 +6,6 @@ import android.view.*
 import android.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.doomsdayrs.api.shosetsu.services.core.objects.Novel
 import com.github.doomsdayrs.apps.shosetsu.R
 import com.github.doomsdayrs.apps.shosetsu.R.layout.search_activity
 import com.github.doomsdayrs.apps.shosetsu.backend.Utilities.setActivityTitle
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/adapters/SearchResultsAdapter.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/adapters/SearchResultsAdapter.kt
index 98f3e36260..b9700ee1c7 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/adapters/SearchResultsAdapter.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/adapters/SearchResultsAdapter.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.github.doomsdayrs.api.shosetsu.services.core.dep.Formatter
-import com.github.doomsdayrs.api.shosetsu.services.core.objects.Novel
 import com.github.doomsdayrs.apps.shosetsu.R
 import com.github.doomsdayrs.apps.shosetsu.backend.database.Database
 import com.github.doomsdayrs.apps.shosetsu.ui.main.MainActivity
diff --git a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/viewHolders/SearchViewHolder.kt b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/viewHolders/SearchViewHolder.kt
index 224cf8cfde..c930213324 100644
--- a/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/viewHolders/SearchViewHolder.kt
+++ b/app/src/main/java/com/github/doomsdayrs/apps/shosetsu/ui/search/viewHolders/SearchViewHolder.kt
@@ -62,7 +62,7 @@ class SearchViewHolder(itemView: View, val searchFragment: SearchFragment) : Rec
                 if (!searchFragment.containsData(id)) {
                     val intArray: ArrayList<Int> = getIntLibrary()
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        intArray.removeIf { novelID: Int? -> !DatabaseNovels.getNovelTitle(novelID!!).toLowerCase().contains(query.toLowerCase(Locale.ROOT)) }
+                        intArray.removeIf { novelID: Int? -> !DatabaseNovels.getNovelTitle(novelID!!).toLowerCase(Locale.ROOT).contains(query.toLowerCase(Locale.ROOT)) }
                     } else {
                         for (x in intArray.indices.reversed()) if (!DatabaseNovels.getNovelTitle(intArray[x]).toLowerCase(Locale.ROOT).contains(query.toLowerCase(Locale.ROOT))) intArray.removeAt(x)
                     }
diff --git a/app/src/main/res/layout/fragment_catalogue.xml b/app/src/main/res/layout/fragment_catalogue.xml
index e195a8333e..8c78a0dfd2 100644
--- a/app/src/main/res/layout/fragment_catalogue.xml
+++ b/app/src/main/res/layout/fragment_catalogue.xml
@@ -44,7 +44,6 @@
 
         <TextView
             android:visibility="gone"
-            android:id="@+id/fragment_catalogue_empty"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/no_results_found"
diff --git a/app/src/main/res/layout/updated_novel_card.xml b/app/src/main/res/layout/updated_novel_card.xml
index 0817bd3469..95bbbeaa13 100644
--- a/app/src/main/res/layout/updated_novel_card.xml
+++ b/app/src/main/res/layout/updated_novel_card.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="2dp">
@@ -82,7 +81,8 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            android:contentDescription="@string/todo" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 3b337c37a5..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index eea1ec7bc6..0000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index fca3f51320..0000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 90a410db9e..0000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 6762eb478b..0000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1aeef19c49..a546f45c64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,9 +22,7 @@
     <string name="novel_title">Novel Title:</string>
     <string name="novel_author">Novel Author(s):</string>
     <string name="novel_description">Novel Description</string>
-    <string name="anilist">Anilist</string>
     <string name="download">Download</string>
-    <string name="myanimelist">Myanimelist</string>
     <string name="download_directory">Download directory</string>
     <string name="position">Position:</string>
     <string name="backup_now">Backup Now</string>
diff --git a/build.gradle b/build.gradle
index 4fda55a999..74a12d3e07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-alpha06'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha07'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files