diff --git a/app/build.gradle b/app/build.gradle
index 7107293..10416a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1"
 }
+
 repositories {
     mavenCentral()
 }
diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java
index 8418a48..765847a 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.java
@@ -1,7 +1,6 @@
 package com.denizd.substitutionplan;
 
 import android.content.SharedPreferences;
-import android.graphics.PorterDuff;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder> {
     private List<Subst> mSubst;
+    private static int colour;
+    private static String colorCheck;
 
     public static class CardViewHolder extends RecyclerView.ViewHolder {
         public ImageView mImageView;
@@ -65,341 +66,482 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder
         holder.mRoom.setText(currentItem.getRoom());
         holder.mAdditional.setText(currentItem.getAdditional());
 
-        String colorChecker = holder.mCourse.getText().toString().toLowerCase();
-        if (colorChecker.contains("deu") || colorChecker.contains("dep") || colorChecker.contains("daz")) {
-            if (prefs.getInt("colGerman", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+        colour = 0;
+        try {
+            colorCheck = holder.mCourse.getText().toString().toLowerCase().substring(0, 3);
+            switch (colorCheck) {
+                case "deu": case "dep": case "daz": case "fda": {
+                    colour = prefs.getInt("colGerman", 0);
+                    break;
+                }
+                case "mat": case "map": {
+                    colour = prefs.getInt("colMaths", 0);
+                    break;
+                }
+                case "eng": case "enp": case "ena": {
+                    colour = prefs.getInt("colEnglish", 0);
+                    break;
+                }
+                case "spo": case "spp": case "spth": {
+                    colour = prefs.getInt("colPhysEd", 0);
+                    break;
+                }
+                case "pol": case "pop": {
+                    colour = prefs.getInt("colPolitics", 0);
+                    break;
+                }
+                case "dar": case "dap": {
+                    colour = prefs.getInt("colTheatre", 0);
+                    break;
+                }
+                case "phy": case "php": {
+                    colour = prefs.getInt("colPhysics", 0);
+                    break;
+                }
+                case "bio": case "bip": {
+                    colour = prefs.getInt("colBiology", 0);
+                    break;
+                }
+                case "che": case "chp": {
+                    colour = prefs.getInt("colChemistry", 0);
+                    break;
+                }
+                case "phi": case "psp": {
+                    colour = prefs.getInt("colPhilosophy", 0);
+                    break;
+                }
+                case "laa": case "laf": case "lat": {
+                    colour = prefs.getInt("colLatin", 0);
+                    break;
+                }
+                case "spa": case "spf": {
+                    colour = prefs.getInt("colSpanish", 0);
+                    break;
+                }
+                case "fra": case "frf": case "frz": {
+                    colour = prefs.getInt("colFrench", 0);
+                    break;
+                }
+                case "inf": {
+                    colour = prefs.getInt("colCompsci", 0);
+                    break;
+                }
+                case "ges": {
+                    colour = prefs.getInt("colHistory", 0);
+                    break;
+                }
+                case "rel": {
+                    colour = prefs.getInt("colReligion", 0);
+                    break;
+                }
+                case "geg": case "wuk": {
+                    colour = prefs.getInt("colGeography", 0);
+                    break;
+                }
+                case "kun": {
+                    colour = prefs.getInt("colArts", 0);
+                    break;
+                }
+                case "mus": {
+                    colour = prefs.getInt("colMusic", 0);
+                    break;
+                }
+                case "tue": {
+                    colour = prefs.getInt("colTurkish", 0);
+                    break;
+                }
+                case "chi": {
+                    colour = prefs.getInt("colChinese", 0);
+                    break;
+                }
+                case "gll": {
+                    colour = prefs.getInt("colGLL", 0);
+                    break;
+                }
+                case "wat": {
+                    colour = prefs.getInt("colWAT", 0);
+                    break;
+                }
+                case "för": {
+                    colour = prefs.getInt("colForder", 0);
+                    break;
+                }
+                case "met": {
+                    colour = prefs.getInt("colWP", 0);
+                    break;
+                }
+                default: {
+                    colour = 0;
+                    break;
                 }
             }
-        } else if (colorChecker.contains("mat") || colorChecker.contains("map")) {
-            if (prefs.getInt("colMaths", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
-            } else {
+        } catch (StringIndexOutOfBoundsException e) {
+            try {
+                String colorCheck2 = holder.mCourse.getText().toString().toLowerCase().substring(0, 2);
+                switch (colorCheck2) {
+                    case "nw": {
+                        colour = prefs.getInt("colBiology", 0);
+                        break;
+                    }
+                    case "wp": {
+                        colour = prefs.getInt("colWP", 0);
+                        break;
+                    }
+                    default: {
+                        colour = 0;
+                        break;
+                    }
+                }
+            } catch (StringIndexOutOfBoundsException e1) {
+                colour = 0;
+            }
+        } finally {
+            if (colour == 0) {
                 if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+                    colour = R.color.lightgrey;
                 } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+                    colour = R.color.lessdark;
                 }
             }
-        } else if (colorChecker.contains("eng") || colorChecker.contains("enp") || colorChecker.contains("ena")) {
-            if (prefs.getInt("colEnglish", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("spo") || colorChecker.contains("spp") || colorChecker.contains("spth")) {
-            if (prefs.getInt("colPhysEd", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("pol") || colorChecker.contains("pop")) {
-            if (prefs.getInt("colPolitics", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("dar") || colorChecker.contains("dap")) {
-            if (prefs.getInt("colTheatre", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("phy") || colorChecker.contains("php")) {
-            if (prefs.getInt("colPhysics", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("bio") || colorChecker.contains("bip") || colorChecker.contains("nw")) {
-            if (prefs.getInt("colBiology", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("che") || colorChecker.contains("chp")) {
-            if (prefs.getInt("colChemistry", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("phi") || colorChecker.contains("psp")) {
-            if (prefs.getInt("colPhilosophy", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("laa") || colorChecker.contains("laf") || colorChecker.contains("lat")) {
-            if (prefs.getInt("colLatin", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("spa") || colorChecker.contains("spf")) {
-            if (prefs.getInt("colSpanish", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("fra") || colorChecker.contains("frf") || colorChecker.contains("frz")) {
-            if (prefs.getInt("colFrench", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("inf")) {
-            if (prefs.getInt("colCompSci", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("ges")) {
-            if (prefs.getInt("colHistory", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("rel")) {
-            if (prefs.getInt("colReligion", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("geg") || colorChecker.contains("wuk")) {
-            if (prefs.getInt("colGeography", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("kun")) {
-            if (prefs.getInt("colArts", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("mus")) {
-            if (prefs.getInt("colMusic", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("tue")) {
-            if (prefs.getInt("colTurkish", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("chi")) {
-            if (prefs.getInt("colChinese", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("gll")) {
-            if (prefs.getInt("colGLL", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("wat")) {
-            if (prefs.getInt("colWAT", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("för")) {
-            if (prefs.getInt("colForder", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else if (colorChecker.contains("wp") || colorChecker.contains("met")) {
-            if (prefs.getInt("colWP", 0) != 0) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
-            } else {
-                if (prefs.getInt("themeInt", 0) == 1) {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                } else {
-                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                }
-            }
-        } else {
-            if (prefs.getInt("themeInt", 0) == 1) {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
-            } else {
-                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
-            }
+            holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), colour));
+            holder.mCourse.setTextColor(ContextCompat.getColor(holder.mCourse.getContext(), colour));
         }
+
+//        String colorChecker = holder.mCourse.getText().toString().toLowerCase();
+//        if (colorChecker.contains("deu") || colorChecker.contains("dep") || colorChecker.contains("daz")) {
+//            if (prefs.getInt("colGerman", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("mat") || colorChecker.contains("map")) {
+//            if (prefs.getInt("colMaths", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("eng") || colorChecker.contains("enp") || colorChecker.contains("ena")) {
+//            if (prefs.getInt("colEnglish", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("spo") || colorChecker.contains("spp") || colorChecker.contains("spth")) {
+//            if (prefs.getInt("colPhysEd", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("pol") || colorChecker.contains("pop")) {
+//            if (prefs.getInt("colPolitics", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("dar") || colorChecker.contains("dap")) {
+//            if (prefs.getInt("colTheatre", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("phy") || colorChecker.contains("php")) {
+//            if (prefs.getInt("colPhysics", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("bio") || colorChecker.contains("bip") || colorChecker.contains("nw")) {
+//            if (prefs.getInt("colBiology", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("che") || colorChecker.contains("chp")) {
+//            if (prefs.getInt("colChemistry", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("phi") || colorChecker.contains("psp")) {
+//            if (prefs.getInt("colPhilosophy", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("laa") || colorChecker.contains("laf") || colorChecker.contains("lat")) {
+//            if (prefs.getInt("colLatin", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("spa") || colorChecker.contains("spf")) {
+//            if (prefs.getInt("colSpanish", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("fra") || colorChecker.contains("frf") || colorChecker.contains("frz")) {
+//            if (prefs.getInt("colFrench", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("inf")) {
+//            if (prefs.getInt("colCompSci", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("ges")) {
+//            if (prefs.getInt("colHistory", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("rel")) {
+//            if (prefs.getInt("colReligion", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("geg") || colorChecker.contains("wuk")) {
+//            if (prefs.getInt("colGeography", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("kun")) {
+//            if (prefs.getInt("colArts", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("mus")) {
+//            if (prefs.getInt("colMusic", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("tue")) {
+//            if (prefs.getInt("colTurkish", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("chi")) {
+//            if (prefs.getInt("colChinese", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("gll")) {
+//            if (prefs.getInt("colGLL", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("wat")) {
+//            if (prefs.getInt("colWAT", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("för")) {
+//            if (prefs.getInt("colForder", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else if (colorChecker.contains("wp") || colorChecker.contains("met")) {
+//            if (prefs.getInt("colWP", 0) != 0) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
+//            } else {
+//                if (prefs.getInt("themeInt", 0) == 1) {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                } else {
+//                    holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                    holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                }
+//            }
+//        } else {
+//            if (prefs.getInt("themeInt", 0) == 1) {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
+//            } else {
+//                holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//                holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
+//            }
+//        }
     }
 
     @Override
diff --git a/app/src/main/java/com/denizd/substitutionplan/FirstTime.java b/app/src/main/java/com/denizd/substitutionplan/FirstTime.java
index 38f03e1..3672d99 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FirstTime.java
+++ b/app/src/main/java/com/denizd/substitutionplan/FirstTime.java
@@ -116,8 +116,9 @@ public class FirstTime extends AppCompatActivity {
             public void onClick(View view) {
                 AlertDialog.Builder alertDialog;
                 alertDialog = new AlertDialog.Builder(context, R.style.AlertDialogCustomLight);
-                alertDialog.setTitle(getString(R.string.helpCoursesTitle));
                 View dialogView = LayoutInflater.from(context).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText(R.string.helpCoursesTitle);
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText(getString(R.string.helpCourses));
                 alertDialog.setView(dialogView);
@@ -130,8 +131,9 @@ public class FirstTime extends AppCompatActivity {
             public void onClick(View view) {
                 AlertDialog.Builder alertDialog;
                 alertDialog = new AlertDialog.Builder(context, R.style.AlertDialogCustomLight);
-                alertDialog.setTitle(getString(R.string.helpClassesTitle));
                 View dialogView = LayoutInflater.from(context).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText(R.string.helpClassesTitle);
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText(getString(R.string.helpClasses));
                 alertDialog.setView(dialogView);
diff --git a/app/src/main/java/com/denizd/substitutionplan/FoodFragment.kt b/app/src/main/java/com/denizd/substitutionplan/FoodFragment.kt
index df3b641..8f93907 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FoodFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FoodFragment.kt
@@ -26,7 +26,7 @@ class FoodFragment : Fragment(R.layout.food_layout) {
         super.onViewCreated(view, savedInstanceState)
         val pullToRefresh = getView()?.findViewById(R.id.pullToRefresh) as SwipeRefreshLayout
         val prefs = PreferenceManager.getDefaultSharedPreferences(activity) as SharedPreferences
-        val edit = prefs.edit() as SharedPreferences.Editor
+//        val edit = prefs.edit() as SharedPreferences.Editor
         val easyPrefs = EasyPrefrences(context!!)
         val foodListPopulation = ArrayList<String>(easyPrefs.getListString("foodListPrefs"))
 
diff --git a/app/src/main/java/com/denizd/substitutionplan/FragmentSettings.java b/app/src/main/java/com/denizd/substitutionplan/FragmentSettings.java
index 4a3c983..0e04c35 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FragmentSettings.java
+++ b/app/src/main/java/com/denizd/substitutionplan/FragmentSettings.java
@@ -111,8 +111,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle(getString(R.string.helpCoursesTitle));
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText(R.string.helpCoursesTitle);
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText(getString(R.string.helpCourses));
                 alertDialog.setView(dialogView);
@@ -129,8 +130,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle(getString(R.string.helpClassesTitle));
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText(R.string.helpClassesTitle);
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText(getString(R.string.helpClasses));
                 alertDialog.setView(dialogView);
@@ -193,36 +195,41 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
             }
         });
 
-        final String[] coursesNoLang = {"German", "Maths", "English", "PhysEd", "Politics", "Theatre",
-        "Physics", "Biology", "Chemistry", "Philosophy", "Latin", "Spanish", "French", "CompSci",
-        "History", "Religion", "Geography", "Arts", "Music", "Turkish", "Chinese", "GLL", "WAT", "Forder", "WP"};
-        final String[] courses = {getString(R.string.courseDeu), getString(R.string.courseMat), getString(R.string.courseEng),
-                getString(R.string.courseSpo), getString(R.string.coursePol), getString(R.string.courseDar),
-                getString(R.string.coursePhy), getString(R.string.courseBio), getString(R.string.courseChe),
-                getString(R.string.coursePhi), getString(R.string.courseLat), getString(R.string.courseSpa),
-                getString(R.string.courseFra), getString(R.string.courseInf), getString(R.string.courseGes),
-                getString(R.string.courseRel), getString(R.string.courseGeg), getString(R.string.courseKun),
-                getString(R.string.courseMus), getString(R.string.courseTue), getString(R.string.courseChi),
-                getString(R.string.courseGll), getString(R.string.courseWat), getString(R.string.courseFor),
-                getString(R.string.courseWp)};
-        final int[] coursesIcons = {R.drawable.ic_german, R.drawable.ic_maths, R.drawable.ic_english,
-                R.drawable.ic_pe, R.drawable.ic_politics, R.drawable.ic_drama, R.drawable.ic_physics,
-                R.drawable.ic_biology, R.drawable.ic_chemistry, R.drawable.ic_philosophy, R.drawable.ic_latin,
-                R.drawable.ic_spanish, R.drawable.ic_french, R.drawable.ic_compsci, R.drawable.ic_history,
-                R.drawable.ic_religion, R.drawable.ic_geography, R.drawable.ic_arts, R.drawable.ic_music,
-                R.drawable.ic_turkish, R.drawable.ic_chinese, R.drawable.ic_gll, R.drawable.ic_wat,
-                R.drawable.ic_help, R.drawable.ic_pencil};
+        final String[] coursesNoLang = {"German", "English", "French", "Spanish", "Latin", "Turkish", "Chinese", "Arts", "Music", "Theatre",
+                "Geography", "History", "Politics", "Philosophy", "Religion",
+                "Maths", "Biology", "Chemistry", "Physics", "CompSci",
+                "PhysEd", "GLL", "WAT", "Forder", "WP"};
+        final String[] courses = {getString(R.string.courseDeu), getString(R.string.courseEng), getString(R.string.courseFra),
+                getString(R.string.courseSpa), getString(R.string.courseLat), getString(R.string.courseTue),
+                getString(R.string.courseChi), getString(R.string.courseKun), getString(R.string.courseMus),
+                getString(R.string.courseDar),
+                getString(R.string.courseGeg), getString(R.string.courseGes), getString(R.string.coursePol),
+                getString(R.string.coursePhi), getString(R.string.courseRel),
+                getString(R.string.courseMat), getString(R.string.courseBio), getString(R.string.courseChe),
+                getString(R.string.coursePhy), getString(R.string.courseInf),
+                getString(R.string.courseSpo), getString(R.string.courseGll), getString(R.string.courseWat),
+                getString(R.string.courseFor), getString(R.string.courseWp)};
+        final int[] coursesIcons = {R.drawable.ic_german, R.drawable.ic_english,
+                R.drawable.ic_french, R.drawable.ic_spanish, R.drawable.ic_latin, R.drawable.ic_turkish,
+                R.drawable.ic_chinese, R.drawable.ic_arts, R.drawable.ic_music, R.drawable.ic_drama,
+                R.drawable.ic_geography, R.drawable.ic_history, R.drawable.ic_politics, R.drawable.ic_philosophy,
+                R.drawable.ic_religion,
+                R.drawable.ic_maths, R.drawable.ic_physics, R.drawable.ic_biology, R.drawable.ic_chemistry,
+                R.drawable.ic_compsci,
+                R.drawable.ic_pe, R.drawable.ic_gll, R.drawable.ic_wat, R.drawable.ic_help, R.drawable.ic_pencil};
         customiseColours.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                final AlertDialog.Builder alertDialog;
+                final AlertDialog.Builder colourCustomiserBuilder;
                 if (prefs.getInt("themeInt", 0) == 1) {
-                    alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
+                    colourCustomiserBuilder = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
                 } else {
-                    alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
+                    colourCustomiserBuilder = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle(getString(R.string.customisecolor1));
+//                colourCustomiserBuilder.setTitle(getString(R.string.customisecolor1));
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.empty_dialog, null);
+                TextView titleText = dialogView.findViewById(R.id.empty_textviewtitle);
+                titleText.setText(R.string.customisecolor1);
                 LinearLayout emptyLayout = dialogView.findViewById(R.id.empty_linearlayout);
                 for (i = 0; i < coursesNoLang.length; i++) {
                     View item = LayoutInflater.from(getContext()).inflate(R.layout.list_item, null);
@@ -240,215 +247,245 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                         itemImage.getDrawable().setTint(ContextCompat.getColor(getContext(), prefs.getInt("col" + titleNoLang, 0)));
                     }
 
-
                     layout.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            final AlertDialog.Builder alertDialog;
+                            final AlertDialog.Builder colourPickerBuilder;
                             if (prefs.getInt("themeInt", 0) == 1) {
-                                alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
+                                colourPickerBuilder = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
                             } else {
-                                alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
+                                colourPickerBuilder = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                             }
-                            alertDialog.setTitle(title);
+//                            colourPickerBuilder.setTitle(title);
                             View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.empty_dialog, null);
+                            TextView titleText = dialogView.findViewById(R.id.empty_textviewtitle);
+                            titleText.setText(title);
                             LinearLayout emptyLayout = dialogView.findViewById(R.id.empty_linearlayout);
                             View picker = LayoutInflater.from(getContext()).inflate(R.layout.colour_picker, null);
                             emptyLayout.addView(picker);
-                            alertDialog.setView(dialogView);
-                            final AlertDialog dialog = alertDialog.create();
-                            dialog.show();
+                            colourPickerBuilder.setView(dialogView);
+                            final AlertDialog colourPickerDialog = colourPickerBuilder.create();
 
-                            MaterialButton red = picker.findViewById(R.id.colourRed);
-                            MaterialButton pink = picker.findViewById(R.id.colourPink);
-                            MaterialButton purple = picker.findViewById(R.id.colourPurple);
-                            MaterialButton deeppurple = picker.findViewById(R.id.colourDeepPurple);
-                            MaterialButton lavender = picker.findViewById(R.id.colourLavender);
-                            MaterialButton indigo = picker.findViewById(R.id.colourIndigo);
-                            MaterialButton blue = picker.findViewById(R.id.colourBlue);
-                            MaterialButton lightblue = picker.findViewById(R.id.colourLightBlue);
-                            MaterialButton teal = picker.findViewById(R.id.colourTeal);
-                            MaterialButton green = picker.findViewById(R.id.colourGreen);
-                            MaterialButton yellow = picker.findViewById(R.id.colourYellow);
-                            MaterialButton orange = picker.findViewById(R.id.colourOrange);
-                            MaterialButton neonred = picker.findViewById(R.id.colourNeonRed);
-                            MaterialButton neonpink = picker.findViewById(R.id.colourNeonPink);
-                            MaterialButton neonpurple = picker.findViewById(R.id.colourNeonPurple);
-                            MaterialButton neondeeppurple = picker.findViewById(R.id.colourNeonDeepPurple);
-                            MaterialButton neonblue = picker.findViewById(R.id.colourNeonBlue);
-                            MaterialButton neongreen = picker.findViewById(R.id.colourNeonGreen);
-                            MaterialButton neonyellow = picker.findViewById(R.id.colourNeonYellow);
-                            MaterialButton neonorange = picker.findViewById(R.id.colourNeonOrange);
-                            MaterialButton nocolour = picker.findViewById(R.id.colourNone);
-                            red.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.red);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            pink.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.pink);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            purple.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.purple);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            deeppurple.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.deeppurple);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            lavender.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.lavender);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            indigo.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.indigo);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            blue.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.blue);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            lightblue.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.lightblue);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            teal.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.teal);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            green.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.green);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            yellow.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.yellow);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            orange.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.orange);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonred.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonred);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonpink.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonpink);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonpurple.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonpurple);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neondeeppurple.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neondeeppurple);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonblue.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonblue);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neongreen.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neongreen);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonyellow.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonyellow);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            neonorange.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, R.color.neonorange);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
-                            nocolour.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    edit.putInt("col" + titleNoLang, 0);
-                                    edit.apply();
-                                    dialog.dismiss();
-                                }
-                            });
+                            final MaterialButton[] buttons = {picker.findViewById(R.id.colourRed), picker.findViewById(R.id.colourPink),
+                                    picker.findViewById(R.id.colourPurple), picker.findViewById(R.id.colourDeepPurple),
+                                    picker.findViewById(R.id.colourLavender), picker.findViewById(R.id.colourIndigo),
+                                    picker.findViewById(R.id.colourBlue), picker.findViewById(R.id.colourLightBlue),
+                                    picker.findViewById(R.id.colourTeal), picker.findViewById(R.id.colourGreen),
+                                    picker.findViewById(R.id.colourYellow), picker.findViewById(R.id.colourOrange),
+                                    picker.findViewById(R.id.colourNeonRed), picker.findViewById(R.id.colourNeonPink),
+                                    picker.findViewById(R.id.colourNeonPurple), picker.findViewById(R.id.colourNeonDeepPurple),
+                                    picker.findViewById(R.id.colourNeonBlue), picker.findViewById(R.id.colourNeonGreen),
+                                    picker.findViewById(R.id.colourNeonYellow), picker.findViewById(R.id.colourNeonOrange),
+                                    picker.findViewById(R.id.colourNone)};
+                            final int[] colours = {R.color.red, R.color.pink, R.color.purple, R.color.deeppurple,
+                                    R.color.lavender, R.color.indigo, R.color.blue, R.color.lightblue,
+                                    R.color.teal, R.color.green, R.color.yellow, R.color.orange,
+                                    R.color.neonred, R.color.neonpink, R.color.neonpurple, R.color.neondeeppurple,
+                                    R.color.neonblue, R.color.neongreen, R.color.neonyellow, R.color.neonorange, 0};
+                            for (int i2 = 0; i2 < buttons.length; i2++) {
+                                final int colour = colours[i2];
+                                buttons[i2].setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        edit.putInt("col" + titleNoLang, colour);
+                                        edit.apply();
+                                        colourPickerDialog.dismiss();
+                                    }
+                                });
+                            }
 
+                            colourPickerDialog.show();
+
+//                            MaterialButton red = picker.findViewById(R.id.colourRed);
+//                            MaterialButton pink = picker.findViewById(R.id.colourPink);
+//                            MaterialButton purple = picker.findViewById(R.id.colourPurple);
+//                            MaterialButton deeppurple = picker.findViewById(R.id.colourDeepPurple);
+//                            MaterialButton lavender = picker.findViewById(R.id.colourLavender);
+//                            MaterialButton indigo = picker.findViewById(R.id.colourIndigo);
+//                            MaterialButton blue = picker.findViewById(R.id.colourBlue);
+//                            MaterialButton lightblue = picker.findViewById(R.id.colourLightBlue);
+//                            MaterialButton teal = picker.findViewById(R.id.colourTeal);
+//                            MaterialButton green = picker.findViewById(R.id.colourGreen);
+//                            MaterialButton yellow = picker.findViewById(R.id.colourYellow);
+//                            MaterialButton orange = picker.findViewById(R.id.colourOrange);
+//                            MaterialButton neonred = picker.findViewById(R.id.colourNeonRed);
+//                            MaterialButton neonpink = picker.findViewById(R.id.colourNeonPink);
+//                            MaterialButton neonpurple = picker.findViewById(R.id.colourNeonPurple);
+//                            MaterialButton neondeeppurple = picker.findViewById(R.id.colourNeonDeepPurple);
+//                            MaterialButton neonblue = picker.findViewById(R.id.colourNeonBlue);
+//                            MaterialButton neongreen = picker.findViewById(R.id.colourNeonGreen);
+//                            MaterialButton neonyellow = picker.findViewById(R.id.colourNeonYellow);
+//                            MaterialButton neonorange = picker.findViewById(R.id.colourNeonOrange);
+//                            MaterialButton nocolour = picker.findViewById(R.id.colourNone);
+//
+//                            red.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.red);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            pink.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.pink);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            purple.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.purple);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            deeppurple.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.deeppurple);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            lavender.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.lavender);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            indigo.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.indigo);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            blue.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.blue);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            lightblue.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.lightblue);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            teal.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.teal);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            green.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.green);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            yellow.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.yellow);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            orange.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.orange);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonred.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonred);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonpink.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonpink);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonpurple.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonpurple);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neondeeppurple.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neondeeppurple);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonblue.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonblue);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neongreen.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neongreen);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonyellow.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonyellow);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            neonorange.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, R.color.neonorange);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            nocolour.setOnClickListener(new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//                                    edit.putInt("col" + titleNoLang, 0);
+//                                    edit.apply();
+//                                    dialog.dismiss();
+//                                }
+//                            });
                         }
                     });
                     emptyLayout.addView(item);
@@ -456,8 +493,8 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 View button = LayoutInflater.from(getContext()).inflate(R.layout.forever_alone_button, null);
                 MaterialButton buttonclearallcolours = button.findViewById(R.id.buttonclearallcolours);
                 emptyLayout.addView(button);
-                alertDialog.setView(dialogView);
-                final AlertDialog dialog = alertDialog.create();
+                colourCustomiserBuilder.setView(dialogView);
+                final AlertDialog colourCustomiserDialog = colourCustomiserBuilder.create();
                 buttonclearallcolours.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -467,11 +504,11 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                         edit.apply();
                         Toast.makeText(getActivity(), getString(R.string.allcolourscleared),
                                 Toast.LENGTH_LONG).show();
-                        dialog.cancel();
+                        colourCustomiserDialog.cancel();
                     }
                 });
 //                alertDialog.setPositiveButton(R.string.finish, null);
-                dialog.show();
+                colourCustomiserDialog.show();
             }
         });
 
@@ -646,8 +683,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle("Licences");
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText("Licenses");
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText("Libraries:\n • Android Device Names © 2015 Jared Rummler, licensed under the Apache License, Version 2.0" +
                         "\n • EasyPreferences © 2018 Mukesh Solanki, licensed under the MIT License" +
@@ -669,8 +707,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle("Terms & Conditions");
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText("Terms & Conditions");
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText("These terms automatically apply to anyone using this app - therefore, please make sure to read them carefully before using the app. Copying or modifying parts of the app or the entire app, as well as creating derivative versions, is prohibited without permission. This app is intellectual property of the developer.\n" +
                         "\n" +
@@ -709,8 +748,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle("Privacy Policy");
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.simple_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText("Privacy Policy");
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText("The app \"Alexander-von-Humboldt-Plan\", hereby abbreviated to AvH Plan, is provided as a free service by the developer for use as is.\n" +
                         "\n" +
@@ -807,8 +847,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                 } else {
                     alertDialog = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                 }
-                alertDialog.setTitle(getString(R.string.experimentalmenu));
                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.edittext_dialog, null);
+                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                title.setText(R.string.experimentalmenu);
                 TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                 dialogText.setText(getString(R.string.fortest));
                 final EditText dialogEditText = dialogView.findViewById(R.id.dialog_edittext);
@@ -824,8 +865,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                                 } else {
                                     alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                                 }
-                                alertDialogDev.setTitle(getString(R.string.diagnosticsmenu));
                                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.diagnostics_dialog, null);
+                                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                                title.setText(R.string.diagnosticsmenu);
                                 final TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                                 setDiagnosticsText(dialogText, prefs);
                                 Button launch = dialogView.findViewById(R.id.btnResetLaunch);
@@ -871,8 +913,9 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
                                 } else {
                                     alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
                                 }
-                                alertDialogDev.setTitle(getString(R.string.dating));
                                 View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.dating_dialog, null);
+                                TextView title = dialogView.findViewById(R.id.textviewtitle);
+                                title.setText(R.string.dating);
 
                                 Button datingBtn = dialogView.findViewById(R.id.dating_btn);
                                 final EditText boyT = dialogView.findViewById(R.id.dating_txt1);
diff --git a/app/src/main/java/com/denizd/substitutionplan/MainActivity.java b/app/src/main/java/com/denizd/substitutionplan/MainActivity.java
index 4db13a8..c134590 100644
--- a/app/src/main/java/com/denizd/substitutionplan/MainActivity.java
+++ b/app/src/main/java/com/denizd/substitutionplan/MainActivity.java
@@ -171,12 +171,13 @@ public class MainActivity extends AppCompatActivity {
 
                         AlertDialog.Builder alertDialog;
                         View dialogView = LayoutInflater.from(context).inflate(R.layout.secret_dialog, null);
+                        TextView title = dialogView.findViewById(R.id.textviewtitle);
+                        title.setText(R.string.chinaTitle);
                         if (prefs.getInt("themeInt", 0) == 1) {
                             alertDialog = new AlertDialog.Builder(context, R.style.AlertDialogCustomDark);
                         } else {
                             alertDialog = new AlertDialog.Builder(context, R.style.AlertDialogCustomLight);
                         }
-                        alertDialog.setTitle(R.string.chinaTitle);
                         TextView dialogText = dialogView.findViewById(R.id.dialogtext);
                         dialogText.setText(R.string.chinaDialog);
 //                        Button searchbtn = dialogView.findViewById(R.id.searchbtn);
diff --git a/app/src/main/res/font/manrope_extrabold.ttf b/app/src/main/res/font/manrope_extrabold.ttf
new file mode 100644
index 0000000..63388ff
Binary files /dev/null and b/app/src/main/res/font/manrope_extrabold.ttf differ
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 3dad9fa..2bfa1cb 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -34,12 +34,12 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:animateLayoutChanges="true"
-                    android:fontFamily="@font/manrope_bold"
+                    android:fontFamily="@font/manrope_extrabold"
                     android:layoutAnimation="@anim/layout_animation_fall_down"
                     android:text="@string/app_name"
                     android:textAlignment="center"
                     android:textColor="?attr/colorAccent"
-                    android:textSize="20sp"
+                    android:textSize="22sp"
                     android:singleLine="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/colour_picker.xml b/app/src/main/res/layout/colour_picker.xml
index 8e13003..e12d13c 100644
--- a/app/src/main/res/layout/colour_picker.xml
+++ b/app/src/main/res/layout/colour_picker.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:paddingStart="16dp"
@@ -165,9 +166,10 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/colourNone"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_margin="8dp"
-        android:backgroundTint="?attr/colorText"
         android:text="@string/clearcolour"
-        android:textColor="?attr/colorBackground"/>
+        android:textColor="?attr/colorText"
+        app:strokeColor="?attr/colorText"/>
 
 </TableLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dating_dialog.xml b/app/src/main/res/layout/dating_dialog.xml
index ba7411f..413679e 100644
--- a/app/src/main/res/layout/dating_dialog.xml
+++ b/app/src/main/res/layout/dating_dialog.xml
@@ -3,6 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="@color/datingPink"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/diagnostics_dialog.xml b/app/src/main/res/layout/diagnostics_dialog.xml
index 2ed16f9..ab4bd56 100644
--- a/app/src/main/res/layout/diagnostics_dialog.xml
+++ b/app/src/main/res/layout/diagnostics_dialog.xml
@@ -3,6 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <TextView
+        android:id="@+id/textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="?attr/colorText"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/edittext_dialog.xml b/app/src/main/res/layout/edittext_dialog.xml
index 967bb5b..5068441 100644
--- a/app/src/main/res/layout/edittext_dialog.xml
+++ b/app/src/main/res/layout/edittext_dialog.xml
@@ -3,6 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="?attr/colorText"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/empty_dialog.xml b/app/src/main/res/layout/empty_dialog.xml
index 8ecb08c..e7f339a 100644
--- a/app/src/main/res/layout/empty_dialog.xml
+++ b/app/src/main/res/layout/empty_dialog.xml
@@ -3,10 +3,21 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/empty_textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="?attr/colorText"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp">
+        android:paddingTop="4dp">
 
         <LinearLayout
             android:id="@+id/empty_linearlayout"
@@ -15,7 +26,6 @@
             android:paddingStart="0dp"
             android:paddingEnd="0dp"
             android:paddingBottom="0dp"
-            android:paddingTop="8dp"
             android:orientation="vertical">
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/forever_alone_button.xml b/app/src/main/res/layout/forever_alone_button.xml
index a4fd95b..7dd198c 100644
--- a/app/src/main/res/layout/forever_alone_button.xml
+++ b/app/src/main/res/layout/forever_alone_button.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonclearallcolours"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:backgroundTint="?attr/colorText"
-        android:textColor="?attr/colorBackground"
+        app:strokeColor="?attr/colorText"
+        android:textColor="?attr/colorText"
         android:text="@string/clearall"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"/>
+        android:layout_marginEnd="16dp"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/secret_dialog.xml b/app/src/main/res/layout/secret_dialog.xml
index 80ace35..b8cc225 100644
--- a/app/src/main/res/layout/secret_dialog.xml
+++ b/app/src/main/res/layout/secret_dialog.xml
@@ -3,6 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="?attr/colorText"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/simple_dialog.xml b/app/src/main/res/layout/simple_dialog.xml
index f7cd229..13a97a4 100644
--- a/app/src/main/res/layout/simple_dialog.xml
+++ b/app/src/main/res/layout/simple_dialog.xml
@@ -3,6 +3,17 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/textviewtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:layout_gravity="center_horizontal"
+        android:textColor="?attr/colorText"/>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"