diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca1fd5f..dc0165c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/appName"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         tools:ignore="GoogleAppIndexingWarning">
@@ -24,7 +24,7 @@
 
         <activity
             android:name=".Main"
-            android:label="@string/app_name"
+            android:label="@string/appName"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/AppTheme0.Launcher"
             android:windowSoftInputMode="adjustPan">
diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
index b6ae668..dd11901 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
@@ -93,7 +93,7 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
         if (colour != 0) {
             holder.mCard.setCardBackgroundColor(ContextCompat.getColor(holder.mCourse.context, colour))
         } else {
-            holder.mCard.setCardBackgroundColor(ContextCompat.getColor(holder.mCourse.context, R.color.lightbackground))
+            holder.mCard.setCardBackgroundColor(ContextCompat.getColor(holder.mCourse.context, R.color.colorBackgroundLight))
         }
     }
 
diff --git a/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt
index bc956b3..9c88d5b 100644
--- a/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt
@@ -1,6 +1,5 @@
 package com.denizd.substitutionplan
 
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -40,7 +39,7 @@ class ColourAdapter(private var mColours: List<Colour>, onClickListener: OnClick
         val colour = if (currentItem.colour != 0) {
             currentItem.colour
         } else {
-            R.color.lightbackground
+            R.color.colorBackgroundLight
         }
         holder.cardView.setCardBackgroundColor(ContextCompat.getColor(holder.image.context, colour))
     }
diff --git a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
index ffff0be..f7cf0b1 100644
--- a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
@@ -24,7 +24,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
     private var plan = isplan
     private var menu = ismenu
 
-    /*  booleans to improve speed when fetching data
+    /*  booleans to improve speed and decrease network usage when fetching data by only grabbing the required HTML pages
         "plan" = true is required to fetch the substitution data
         "menu" = true is required to fetch the food menu
         "jobservice" = true is required to send a notification
@@ -40,10 +40,10 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
     private val prefs = PreferenceManager.getDefaultSharedPreferences(mContext)
     private val edit = prefs.edit()
     private lateinit var pullToRefresh: SwipeRefreshLayout
-    var currentTime = ""
-    var currentFoodTime = ""
-    val substUrl = "https://djd4rkn355.github.io/subst_test.html"
-    val foodUrl = "https://djd4rkn355.github.io/food_test.html"
+    private var currentTime = ""
+    private var currentFoodTime = ""
+    private val substUrl = "https://djd4rkn355.github.io/subst_test.html"
+    private val foodUrl = "https://djd4rkn355.github.io/food_test.html"
 
     override fun doInBackground(vararg params: Void?): Void? {
         try {
@@ -186,7 +186,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                         val openAppPending = PendingIntent.getActivity(mContext, 0, openApp, 0)
 
                         val notificationLayout = RemoteViews(mContext.packageName, R.layout.notification)
-                        notificationLayout.setTextViewText(R.id.notification_title, mContext.getString(R.string.subst))
+                        notificationLayout.setTextViewText(R.id.notification_title, mContext.getString(R.string.substitutionPlan))
                         notificationLayout.setTextViewText(R.id.notification_textview, notifText)
 
                         if (notifText.isNotEmpty()) {
@@ -223,7 +223,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                         menu -> currentFoodTime
                         else -> currentTime
                     }
-                    val lastUpdated = sb.append(mContext.getText(R.string.lastupdatedK)).append(time)
+                    val lastUpdated = sb.append(mContext.getText(R.string.lastUpdated)).append(time)
                     Snackbar.make(snackBarView, lastUpdated, Snackbar.LENGTH_LONG).show()
                 }
             }
@@ -234,7 +234,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                     pullToRefresh.isRefreshing = false
                 } catch (ignored: Exception) {}
                 val snackBarView = v.findViewById<View>(R.id.coordination)
-                Snackbar.make(snackBarView, mContext.getText(R.string.nointernet), Snackbar.LENGTH_LONG).show()
+                Snackbar.make(snackBarView, mContext.getText(R.string.noInternet), Snackbar.LENGTH_LONG).show()
             }
         }
         return null
diff --git a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt b/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
index 4819c3f..9974dc1 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
@@ -37,11 +37,11 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
             AppCompatDelegate.MODE_NIGHT_NO -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
+                    window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                 }
             }
             else -> {
-                window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
+                window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                 window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
             }
         }
@@ -61,10 +61,10 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
         val helpCourses = findViewById<ImageButton>(R.id.chipHelpCourses)
 
         helpClasses.setOnClickListener {
-            createDialog(getString(R.string.helpClassesTitle), getString(R.string.helpClasses))
+            createDialog(getString(R.string.enterGradeHelpTitle), getString(R.string.enterGradeHelp))
         }
         helpCourses.setOnClickListener {
-            createDialog(getString(R.string.helpCoursesTitle), getString(R.string.helpCourses))
+            createDialog(getString(R.string.enterCoursesHelpTitle), getString(R.string.enterCoursesHelp))
         }
 
         val inflater = this.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
@@ -82,6 +82,7 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
                 edit.putInt("themeInt", 0)
             }
             edit.putBoolean("notif", notif.isChecked)
+                    .putBoolean("greeting", findViewById<CheckBox>(R.id.cbGreetings).isChecked)
                     .putBoolean("defaultPersonalised", pers.isChecked)
                     .putBoolean("firstTime", false)
                     .apply()
diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt
index 6dfd917..dbfa2dd 100644
--- a/app/src/main/java/com/denizd/substitutionplan/Main.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/Main.kt
@@ -72,12 +72,12 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                        window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
+                        window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                     }
                 }
                 else -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                    window.navigationBarColor = ContextCompat.getColor(this, R.color.background)
+                    window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                 }
 //                else -> {
 //                    when (context.resources.configuration.uiMode) {
@@ -99,7 +99,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
             if (!prefs.getBoolean("autoRefresh", false) && prefs.getInt("firstTimeOpening", 0) != 0) {
                 try {
                     val sb = StringBuilder()
-                    val updated = sb.append(getText(R.string.lastupdatedK)).append(prefs.getString("time", "")).toString()
+                    val updated = sb.append(getText(R.string.lastUpdated)).append(prefs.getString("time", "")).toString()
 
                     Snackbar.make(contextView, updated, Snackbar.LENGTH_LONG).show()
                 } catch (e: IllegalArgumentException) {}
@@ -113,9 +113,9 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                         val alertDialog = AlertDialog.Builder(context, R.style.AlertDialog)
                         val dialogView = LayoutInflater.from(context).inflate(R.layout.secret_dialog, null)
                         val title = dialogView.findViewById<TextView>(R.id.textviewtitle)
-                        title.text = getString(R.string.chinaTitle)
+                        title.text = getString(R.string.chineseDevicesTitle)
                         val dialogText = dialogView.findViewById<TextView>(R.id.dialogtext)
-                        dialogText.text = getString(R.string.chinaDialog)
+                        dialogText.text = getString(R.string.chineseDevicesHelp)
                         alertDialog.setView(dialogView).show()
 
                         edit.putBoolean("huaweiDeviceDialog", false).apply()
@@ -127,29 +127,6 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
             if (prefs.getBoolean("greeting", true)) {
                 if ((prefs.getString("username", "") ?: "").isNotEmpty()) {
                     textViewGreeting.text = getGreetingString()
-//                    val generator = Random()
-//                    val greetings = resources.getStringArray(R.array.greeting8_array)
-//                    val rightNow = Calendar.getInstance()
-//                    val currentHour = rightNow.get(Calendar.HOUR_OF_DAY)
-//
-//                    textViewGreeting.text = when (generator.nextInt(9)) {
-//                        0 -> getString(R.string.greeting0, prefs.getString("username", ""))
-//                        1 -> getString(R.string.greeting1, prefs.getString("username", ""))
-//                        2 -> getString(R.string.greeting2, prefs.getString("username", ""))
-//                        3 -> getString(R.string.greeting3, prefs.getString("username", ""))
-//                        4 -> getString(R.string.greeting4, prefs.getString("username", ""))
-//                        5 -> getString(R.string.greeting5, prefs.getString("username", ""))
-//                        6 -> getString(R.string.greeting6, prefs.getString("username", ""))
-//                        7 -> getString(R.string.greeting7, prefs.getString("username", ""))
-//                        8 -> {
-//                            when {
-//                                currentHour < 11 -> greetings[0] + prefs.getString("username", "") + "."
-//                                currentHour in 11..17 -> greetings[1] + prefs.getString("username", "") + "."
-//                                else -> greetings[1] + prefs.getString("username", "") + "."
-//                            }
-//                        }
-//                        else -> ";)" // getString(R.string.error)
-//                    }
                 }
             } else {
                 textViewGreeting.visibility = View.GONE
@@ -163,11 +140,11 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
             if (prefs.getBoolean("defaultPersonalised", false)) {
                 defaultFragment = PersonalPlanFragment()
                 bottomNav.selectedItemId = R.id.personal
-                toolbarTxt.text = getString(R.string.yourplan)
+                toolbarTxt.text = getString(R.string.yourPlan)
             } else {
                 defaultFragment = GeneralPlanFragment()
                 bottomNav.selectedItemId = R.id.plan
-                toolbarTxt.text = getString(R.string.app_name)
+                toolbarTxt.text = getString(R.string.appName)
             }
             loadFragment(defaultFragment)
 
@@ -177,15 +154,15 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                 when (item.itemId) {
                     R.id.plan -> {
                         fragment = GeneralPlanFragment()
-                        toolbarTxt.text = getString(R.string.app_name)
+                        toolbarTxt.text = getString(R.string.appName)
                     }
                     R.id.personal -> {
                         fragment = PersonalPlanFragment()
-                        toolbarTxt.text = getString(R.string.yourplan)
+                        toolbarTxt.text = getString(R.string.yourPlan)
                     }
                     R.id.menu -> {
                         fragment = FoodFragment()
-                        toolbarTxt.text = getString(R.string.foodmenu)
+                        toolbarTxt.text = getString(R.string.foodMenu)
                     }
                     R.id.openinfopanel -> {
                         openInfoDialog()
@@ -242,9 +219,9 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
         val gen = Random()
 
         val greetingArray = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
-            in 5..10 -> resources.getStringArray(R.array.greetings_morning)
-            in 11..17 -> resources.getStringArray(R.array.greetings_noon)
-            else -> resources.getStringArray(R.array.greetings_evening)
+            in 5..10 -> resources.getStringArray(R.array.greetingsMorning)
+            in 11..17 -> resources.getStringArray(R.array.greetingsNoon)
+            else -> resources.getStringArray(R.array.greetingsEvening)
         }
         return String.format(greetingArray[gen.nextInt(7)], prefs.getString("username", ""))
     }
@@ -254,7 +231,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
         val dialogView = LayoutInflater.from(context).inflate(R.layout.simple_dialog, null)
         dialogView.findViewById<TextView>(R.id.textviewtitle).text = getString(R.string.information)
         val sb = StringBuilder()
-        val dialogText = sb.append(getText(R.string.lastupdatedK)).append((prefs.getString("time", "") ?: "") + "\n\n").append(prefs.getString("informational", ""))
+        val dialogText = sb.append(getText(R.string.lastUpdated)).append((prefs.getString("time", "") ?: "") + ".\n\n").append(prefs.getString("informational", ""))
         dialogView.findViewById<TextView>(R.id.dialogtext).text = dialogText
         dialog.setView(dialogView).show()
     }
diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
index b4adbcb..8c4f4c4 100644
--- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
@@ -123,21 +123,21 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
         })
 
         btnVersion.setOnLongClickListener {
-            Toast.makeText(mContext, getString(R.string.devby), Toast.LENGTH_LONG).show()
+            Toast.makeText(mContext, getString(R.string.madeBy), Toast.LENGTH_LONG).show()
             debugMenu()
         }
     }
 
     override fun onClick(v: View?) {
         when (v?.id) {
-            R.id.chipHelpCourses -> createDialog(getString(R.string.helpCoursesTitle), getString(R.string.helpCourses))
-            R.id.chipHelpClasses -> createDialog(getString(R.string.helpClassesTitle), getString(R.string.helpClasses))
+            R.id.chipHelpCourses -> createDialog(getString(R.string.enterCoursesHelpTitle), getString(R.string.enterCoursesHelp))
+            R.id.chipHelpClasses -> createDialog(getString(R.string.enterGradeHelpTitle), getString(R.string.enterGradeHelp))
             R.id.btnCustomiseColours -> createColourDialog()
             R.id.btnWebsite -> {
                 try {
                     customTabsIntent.launchUrl(mContext, Uri.parse("http://307.joomla.schule.bremen.de"))
                 } catch (e: ActivityNotFoundException) {
-                    Toast.makeText(mContext, getString(R.string.chromecompatible), Toast.LENGTH_LONG).show()
+                    Toast.makeText(mContext, getString(R.string.chromeCompatibleNotFound), Toast.LENGTH_LONG).show()
                 }
             }
             R.id.btnLicences -> {
@@ -193,9 +193,9 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                     try {
                         cs = 7
                         customTabsIntent.launchUrl(mContext, Uri.parse("http://www.flussufer.de/gerd/person.htm"))
-                        Toast.makeText(mContext, getString(R.string.donttell), Toast.LENGTH_LONG).show()
+                        Toast.makeText(mContext, getString(R.string.dontTellHim), Toast.LENGTH_LONG).show()
                     } catch (e: ActivityNotFoundException) {
-                        Toast.makeText(mContext, getString(R.string.chromecompatible), Toast.LENGTH_LONG).show()
+                        Toast.makeText(mContext, getString(R.string.chromeCompatibleNotFound), Toast.LENGTH_LONG).show()
                     }
                 }
             }
@@ -215,14 +215,14 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                         edit.putInt("themeInt", 1)
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
                         window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
-                        window?.navigationBarColor = ContextCompat.getColor(mContext, R.color.background)
+                        window?.navigationBarColor = ContextCompat.getColor(mContext, R.color.colorBackground)
 
                     } else {
                         edit.putInt("themeInt", 0)
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                             window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                            window?.navigationBarColor = ContextCompat.getColor(mContext, R.color.background)
+                            window?.navigationBarColor = ContextCompat.getColor(mContext, R.color.colorBackground)
                         }
                     }
                     if (prefs.getBoolean("defaultPersonalised", false)) {
@@ -261,7 +261,7 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
 
         val dialogView = LayoutInflater.from(mContext).inflate(R.layout.recycler_dialog, null)
         val titleText = dialogView.findViewById<TextView>(R.id.empty_textviewtitle)
-        titleText.text = getString(R.string.customisecolor1)
+        titleText.text = getString(R.string.customiseColoursTitle)
         colourRecycler = dialogView.findViewById(R.id.recyclerView)
 
         colourRecycler.layoutManager = GridLayoutManager(mContext, 1)
@@ -312,7 +312,7 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
         val colourPickerDialog: AlertDialog = colourPickerBuilder.create()
 
         val buttons = arrayOf<MaterialButton>(picker.findViewById(R.id.def), picker.findViewById(R.id.red), picker.findViewById(R.id.orange), picker.findViewById(R.id.yellow), picker.findViewById(R.id.green), picker.findViewById(R.id.teal), picker.findViewById(R.id.cyan), picker.findViewById(R.id.blue), picker.findViewById(R.id.purple), picker.findViewById(R.id.pink), picker.findViewById(R.id.brown), picker.findViewById(R.id.grey))
-        val colours = intArrayOf(0, R.color.bgred, R.color.bgorange, R.color.bgyellow, R.color.bggreen, R.color.bgteal, R.color.bgcyan, R.color.bgblue, R.color.bgpurple, R.color.bgpink, R.color.bgbrown, R.color.bggrey)
+        val colours = intArrayOf(0, R.color.bgRed, R.color.bgOrange, R.color.bgYellow, R.color.bgGreen, R.color.bgTeal, R.color.bgCyan, R.color.bgBlue, R.color.bgPurple, R.color.bgPink, R.color.bgBrown, R.color.bgGrey)
 
         for (i2 in 0 until buttons.size) {
             buttons[i2].setOnClickListener {
@@ -338,8 +338,8 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
         val dialogEditText = dialogView.findViewById<EditText>(R.id.dialog_edittext)
         val dialogButton = dialogView.findViewById<Button>(R.id.dialog_button)
 
-        dialogView.findViewById<TextView>(R.id.textviewtitle).text = getString(R.string.experimentalmenu)
-        dialogView.findViewById<TextView>(R.id.dialogtext).text = getString(R.string.fortest)
+        dialogView.findViewById<TextView>(R.id.textviewtitle).text = getString(R.string.experimentalMenu)
+        dialogView.findViewById<TextView>(R.id.dialogtext).text = getString(R.string.menuForTests)
         dialogButton.setOnClickListener {
             when (dialogEditText.text.toString()) {
                 "_DIAGNOSTICS" -> {
@@ -349,7 +349,7 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                     val resetLaunchBtn = devDialogView.findViewById<Button>(R.id.btnResetLaunch)
                     val resetNotifBtn = devDialogView.findViewById<Button>(R.id.btnResetNotif)
 
-                    devDialogView.findViewById<TextView>(R.id.textviewtitle).text = getString(R.string.diagnosticsmenu)
+                    devDialogView.findViewById<TextView>(R.id.textviewtitle).text = getString(R.string.diagnosticsMenu)
                     devDialogText.text = getDiagnosticsText(prefs)
 
                     resetLaunchBtn.setOnClickListener {
@@ -371,7 +371,7 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setPackage("com.google.android.youtube")
                         startActivity(intent)
                     } catch (e: ActivityNotFoundException) {
-                        Toast.makeText(mContext, R.string.noyoutube, Toast.LENGTH_LONG).show()
+                        Toast.makeText(mContext, R.string.youtubeNotFound, Toast.LENGTH_LONG).show()
                     }
                 }
                 "_NOTIFICATION" -> {
@@ -382,7 +382,7 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                     edit.putBoolean("firstTime", true).apply()
                     Toast.makeText(mContext, "First time flag cleared", Toast.LENGTH_LONG).show()
                 }
-                else -> Toast.makeText(mContext, getString(R.string.nothinghappened), Toast.LENGTH_LONG).show()
+                else -> Toast.makeText(mContext, getString(R.string.invalidCode), Toast.LENGTH_LONG).show()
             }
         }
         alertDialog.setView(dialogView)
diff --git a/app/src/main/res/color/bottom_nav_color.xml b/app/src/main/res/color/bottom_nav_color.xml
index 73475d9..992dad7 100644
--- a/app/src/main/res/color/bottom_nav_color.xml
+++ b/app/src/main/res/color/bottom_nav_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@color/accent" />
-    <item android:state_checked="false" android:color="@color/hintcolor" />
+    <item android:state_checked="true" android:color="@color/colorAccent" />
+    <item android:state_checked="false" android:color="@color/colorHint" />
 </selector>
diff --git a/app/src/main/res/drawable-v21/ic_avhlogo_splash.xml b/app/src/main/res/drawable-v21/ic_avhlogo_splash.xml
index c25ff29..276e8d5 100644
--- a/app/src/main/res/drawable-v21/ic_avhlogo_splash.xml
+++ b/app/src/main/res/drawable-v21/ic_avhlogo_splash.xml
@@ -1,5 +1,5 @@
 <vector android:height="120dp" android:viewportHeight="26.073"
     android:viewportWidth="54.31" android:width="250dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/splash_logo"
+    <path android:fillColor="@color/colorSplashLogo"
         android:pathData="m0.642,26.05c-0.1793,-0.0546 -0.3227,-0.1912 -0.423,-0.4034 -0.0868,-0.1835 -0.1299,-0.3499 -0.18,-0.6953 -0.0644,-0.4438 -0.0501,-2.2083 0.0447,-5.5298 0.0442,-1.5476 0.0862,-2.9233 0.0933,-3.0572l0.013,-0.2434 0.1555,-0.0798c0.0855,-0.0439 0.351,-0.1848 0.59,-0.313 0.6131,-0.329 1.3794,-0.7385 1.597,-0.8535 0.1016,-0.0537 0.2971,-0.1587 0.4346,-0.2334 0.1374,-0.0747 0.3525,-0.1897 0.478,-0.2556 0.5334,-0.2802 1.5092,-0.8133 1.8615,-1.017 0.1116,-0.0645 0.2961,-0.1712 0.4099,-0.237 0.2127,-0.123 0.2696,-0.157 0.4011,-0.2397 0.0418,-0.0263 0.1543,-0.0937 0.2499,-0.1497 0.5553,-0.3255 1.6814,-1.0279 2.6508,-1.6533 0.0597,-0.0386 0.1966,-0.1268 0.3042,-0.1961 1.5001,-0.9666 3.6523,-2.4484 4.954,-3.4109 0.3582,-0.2649 1.7314,-1.2221 2.6279,-1.8318 0.7716,-0.5248 2.8139,-1.8787 3.0062,-1.9929 0.0394,-0.0234 0.2252,-0.1412 0.4128,-0.2616s0.4487,-0.2859 0.5801,-0.3677c0.1315,-0.0817 0.3026,-0.1893 0.3802,-0.239 0.2592,-0.1659 1.2231,-0.7326 1.7869,-1.0506 0.5592,-0.3154 1.4818,-0.7903 1.8091,-0.9313 0.6104,-0.2629 1.1407,-0.4489 1.5055,-0.5279 0.1138,-0.0247 0.214,-0.0492 0.2227,-0.0546 0.0322,-0.0199 0.8012,-0.1391 1.0422,-0.1616 0.979,-0.0913 3.2692,-0.0911 4.313,0.0003 1.4035,0.123 2.2951,0.4492 2.6451,0.9679 0.165,0.2444 0.2002,0.3755 0.2007,0.7474 0.0006,0.411 -0.0696,0.716 -0.284,1.2338 -0.3755,0.907 -1.5233,2.5827 -2.7325,3.9889 -0.9585,1.1147 -1.8375,2.4001 -2.4388,3.5662 -0.2381,0.4618 -0.346,0.7207 -0.5387,1.2928 -0.4305,1.2778 -0.4186,1.6374 0.0757,2.2952 0.4236,0.5637 0.9046,0.8012 1.9082,0.9422 0.0887,0.0125 0.3794,0.0227 0.646,0.0227 1.0896,0 2.4249,-0.253 3.886,-0.7363 0.3467,-0.1147 1.0184,-0.3616 1.2494,-0.4593 0.0538,-0.0227 0.1955,-0.0816 0.3151,-0.1309 0.3765,-0.1551 0.5845,-0.2417 0.6518,-0.2713 0.0358,-0.0158 0.163,-0.0696 0.2825,-0.1195 0.1195,-0.05 0.3102,-0.1304 0.4237,-0.1786 0.1135,-0.0483 0.2895,-0.1216 0.3911,-0.1629 0.1016,-0.0413 0.2433,-0.0998 0.3151,-0.1299 0.0717,-0.0301 0.1988,-0.0819 0.2825,-0.115 0.0837,-0.0331 0.2743,-0.1087 0.4237,-0.168 0.6645,-0.2636 0.8709,-0.3322 1.1652,-0.3875 0.4255,-0.0799 0.6165,0.0135 0.6831,0.3339 0.016,0.0772 0.028,0.4053 0.0319,0.8732 0.0065,0.7894 0.0264,1.0214 0.1199,1.401 0.1968,0.799 0.5825,1.2477 1.3058,1.5194 0.3784,0.1421 1.0799,0.2763 1.6675,0.3188 0.3938,0.0285 1.8687,0.0141 2.2077,-0.0216 1.7553,-0.1848 3.1116,-0.488 4.4108,-0.9862 0.2568,-0.0985 0.7865,-0.3131 0.8691,-0.3522 0.0901,-0.0426 0.2578,-0.1131 0.4128,-0.1737 0.0717,-0.028 0.2135,-0.0867 0.3151,-0.1303 0.1016,-0.0437 0.2433,-0.1025 0.3151,-0.1308 0.0717,-0.0282 0.2135,-0.0867 0.3151,-0.13 0.1016,-0.0433 0.2433,-0.1017 0.3151,-0.13 0.0717,-0.0282 0.2128,-0.0862 0.3135,-0.1288 0.1007,-0.0426 0.1877,-0.0729 0.1932,-0.0674 0.0104,0.0104 0.0053,0.0676 -0.1055,1.1898 -0.071,0.7187 -0.1146,0.9429 -0.2464,1.2663 -0.2098,0.5145 -0.7032,1.0472 -1.5039,1.6232 -0.1778,0.1279 -0.9153,0.6186 -1.0884,0.7241 -1.8174,1.1078 -2.509,1.4324 -3.5921,1.6858 -0.8303,0.1943 -2.059,0.2746 -3.8024,0.2487 -0.9463,-0.0141 -1.1963,-0.026 -1.8252,-0.0868 -0.591,-0.0572 -0.9542,-0.126 -1.3471,-0.2555 -0.4719,-0.1555 -0.6843,-0.2909 -1.1215,-0.7153 -0.1842,-0.1788 -0.387,-0.3584 -0.4505,-0.3991 -0.3994,-0.2555 -0.8111,-0.2864 -1.6111,-0.1208 -0.2518,0.0521 -0.825,0.1934 -1.1081,0.2733 -0.1076,0.0303 -0.3178,0.0881 -0.4672,0.1285 -0.1494,0.0404 -0.4036,0.109 -0.5649,0.1527 -1.0207,0.2759 -2.3356,0.5132 -3.3678,0.6077 -0.9254,0.0847 -2.1742,0.0853 -3.0001,0.001 -0.3103,-0.0315 -1.0002,-0.1322 -1.063,-0.1551 -0.0179,-0.007 -0.1499,-0.0358 -0.2933,-0.0649 -0.1434,-0.0292 -0.3487,-0.0781 -0.4563,-0.1087 -0.2615,-0.0744 -0.886,-0.2842 -0.9973,-0.335 -0.049,-0.0224 -0.1498,-0.0657 -0.224,-0.0963 -0.598,-0.2465 -1.384,-0.7544 -1.8513,-1.1964 -0.9436,-0.8924 -1.3564,-2.0681 -1.2817,-3.6505 0.0193,-0.4081 0.0205,-0.4203 0.0997,-0.9778 0.1124,-0.7911 0.0607,-1.4115 -0.1259,-1.5114 -0.0853,-0.0457 -0.3493,0.0288 -0.7149,0.2015 -0.3416,0.1614 -1.1258,0.5975 -1.4555,0.8094 -0.0418,0.0269 -0.2374,0.1503 -0.4346,0.2742 -0.4157,0.2612 -1.416,0.9297 -1.8686,1.2487 -0.0418,0.0295 -0.1215,0.0853 -0.177,0.1239 -0.0555,0.0387 -0.2154,0.1535 -0.3552,0.255 -0.1399,0.1016 -0.2949,0.2135 -0.3445,0.2487 -0.4102,0.291 -1.4365,1.0783 -2.1109,1.6191 -1.4979,1.2014 -2.884,2.2429 -4.237,3.184 -0.1817,0.1264 -1.0192,0.686 -1.2494,0.8348 -0.4025,0.2603 -0.5367,0.3456 -0.5975,0.3799 -0.0358,0.0202 -0.1727,0.1041 -0.3042,0.1866 -0.1314,0.0824 -0.3172,0.1957 -0.4128,0.2518 -0.0956,0.0561 -0.208,0.1241 -0.2499,0.1512 -0.1088,0.0703 -0.5731,0.339 -0.8909,0.5155 -0.1494,0.083 -0.2814,0.1585 -0.2933,0.1677 -0.0307,0.0238 -0.8824,0.4882 -1.195,0.6517 -0.1434,0.075 -0.3292,0.1731 -0.4128,0.2181 -0.4406,0.2368 -2.7812,1.4179 -3.0311,1.5296 -0.0777,0.0347 -0.1999,0.0901 -0.2716,0.1232 -0.3531,0.1628 -0.8439,0.337 -1.072,0.3807 -0.1687,0.0323 -0.4989,0.038 -0.5903,0.0102z" android:strokeWidth=".021728"/>
 </vector>
diff --git a/app/src/main/res/drawable-v21/launch_screen.xml b/app/src/main/res/drawable-v21/launch_screen.xml
index 29fdf25..4b5d11a 100644
--- a/app/src/main/res/drawable-v21/launch_screen.xml
+++ b/app/src/main/res/drawable-v21/launch_screen.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
 
-    <item android:drawable="@color/accent"/>
+    <item android:drawable="@color/colorAccent"/>
 
     <item>
         <bitmap
diff --git a/app/src/main/res/drawable-v23/launch_screen.xml b/app/src/main/res/drawable-v23/launch_screen.xml
index f81d2f2..682a647 100644
--- a/app/src/main/res/drawable-v23/launch_screen.xml
+++ b/app/src/main/res/drawable-v23/launch_screen.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
 
-    <item android:drawable="@color/accent"/>
+    <item android:drawable="@color/colorAccent"/>
 
     <item android:drawable="@drawable/ic_avhlogo"
         android:gravity="center"
diff --git a/app/src/main/res/drawable-v28/launch_screen.xml b/app/src/main/res/drawable-v28/launch_screen.xml
index 9cc804a..063a2f2 100644
--- a/app/src/main/res/drawable-v28/launch_screen.xml
+++ b/app/src/main/res/drawable-v28/launch_screen.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
 
-    <item android:drawable="@color/background"/>
+    <item android:drawable="@color/colorBackground"/>
 
     <item android:drawable="@drawable/ic_avhlogo_splash"
         android:gravity="center"
diff --git a/app/src/main/res/drawable/check_mark.xml b/app/src/main/res/drawable/check_mark.xml
index babaadf..95337e7 100644
--- a/app/src/main/res/drawable/check_mark.xml
+++ b/app/src/main/res/drawable/check_mark.xml
@@ -6,14 +6,14 @@
     <group android:name="background">
         <path
             android:name="circle"
-            android:fillColor="@color/accent"
+            android:fillColor="@color/colorAccent"
             android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" />
     </group>
     <group android:name="check">
         <path
             android:name="tick"
             android:pathData="M6.5,12 l0,0 l0,0"
-            android:strokeColor="@color/background"
+            android:strokeColor="@color/colorBackground"
             android:strokeWidth="1" />
     </group>
 
diff --git a/app/src/main/res/layout/activity_first_time.xml b/app/src/main/res/layout/activity_first_time.xml
index d99c890..a908248 100644
--- a/app/src/main/res/layout/activity_first_time.xml
+++ b/app/src/main/res/layout/activity_first_time.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background"
+    android:background="@color/colorBackground"
     android:fitsSystemWindows="true"
     tools:context=".FirstTime">
 
@@ -35,7 +35,7 @@
                 android:layout_marginStart="16dp"
                 android:text="@string/welcome"
                 android:textAlignment="center"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorAccent"
                 android:fontFamily="@font/manrope_extrabold"
                 android:textSize="24sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -46,9 +46,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:text="@string/firstsomethings"
+                android:text="@string/firstSomeThings"
                 android:textAlignment="center"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="@+id/txtWelcome"
                 app:layout_constraintTop_toBottomOf="@+id/txtWelcome" />
@@ -59,9 +59,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="8dp"
-                android:text="@string/tellmename"
+                android:text="@string/tellMeYourName"
                 android:textAlignment="center"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="@+id/txtsetupthings"
                 app:layout_constraintTop_toBottomOf="@+id/txtsetupthings" />
@@ -69,14 +69,14 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutClasses"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxStrokeColor="@color/accent"
+                app:boxStrokeColor="@color/colorAccent"
                 app:boxStrokeWidth="1dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
-                android:hint="@string/yourname"
-                android:textColorHint="@color/hintcolor"
+                android:hint="@string/yourName"
+                android:textColorHint="@color/colorHint"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/txttellmename"
                 app:layout_constraintTop_toBottomOf="@+id/txttellmename"
@@ -94,7 +94,7 @@
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textColor="@color/textcolor"
+                    android:textColor="@color/colorText"
                     android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -105,8 +105,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:gravity="start"
-                android:text="@string/nextclass"
-                android:textColor="@color/textcolor"
+                android:text="@string/nextGrade"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -115,13 +115,13 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutClass"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxStrokeColor="@color/accent"
+                app:boxStrokeColor="@color/colorAccent"
                 app:boxStrokeWidth="1dp"
                 android:layout_height="wrap_content"
                 android:layout_width="0dp"
                 android:layout_marginTop="8dp"
-                android:hint="@string/yourclass"
-                android:textColorHint="@color/hintcolor"
+                android:hint="@string/yourGrade"
+                android:textColorHint="@color/colorHint"
                 app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtNextClass"
                 app:layout_constraintTop_toBottomOf="@+id/txtNextClass"
@@ -139,7 +139,7 @@
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textColor="@color/textcolor"
+                    android:textColor="@color/colorText"
                     android:textSize="16sp"/>
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -151,7 +151,7 @@
                 android:layout_marginEnd="8dp"
                 android:backgroundTint="@android:color/transparent"
                 android:src="@drawable/ic_qmark"
-                android:tint="@color/textcolor"
+                android:tint="@color/colorText"
                 app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClass"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/txtLayoutClass" />
@@ -161,9 +161,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="@string/seniorsetup"
+                android:text="@string/seniorCourses"
                 android:gravity="start"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtLayoutClass" />
@@ -171,13 +171,13 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/txtLayoutCourses"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxStrokeColor="@color/accent"
+                app:boxStrokeColor="@color/colorAccent"
                 app:boxStrokeWidth="1dp"
                 android:layout_height="wrap_content"
                 android:layout_width="0dp"
                 android:layout_marginTop="8dp"
-                android:hint="@string/yourcourses"
-                android:textColorHint="@color/hintcolor"
+                android:hint="@string/yourCourses"
+                android:textColorHint="@color/colorHint"
                 app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
                 app:layout_constraintStart_toStartOf="@+id/txtSenior"
                 app:layout_constraintTop_toBottomOf="@+id/txtSenior">
@@ -194,7 +194,7 @@
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
                     android:singleLine="true"
-                    android:textColor="@color/textcolor"
+                    android:textColor="@color/colorText"
                     android:textSize="16sp"
                     android:importantForAutofill="no"/>
 
@@ -207,7 +207,7 @@
                 android:layout_marginEnd="8dp"
                 android:backgroundTint="@android:color/transparent"
                 android:src="@drawable/ic_qmark"
-                android:tint="@color/textcolor"
+                android:tint="@color/colorText"
                 app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/txtLayoutCourses" />
@@ -217,32 +217,44 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="@string/moresettings"
-                android:textColor="@color/textcolor"
+                android:text="@string/moreSettings"
+                android:textColor="@color/colorText"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
 
             <CheckBox
-                android:id="@+id/cbDark"
+                android:id="@+id/cbGreetings"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/enabledarkmode"
+                android:text="@string/enableGreeting"
                 android:textAlignment="viewStart"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
+                android:layout_marginTop="8dp"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
                 app:layout_constraintTop_toBottomOf="@+id/txtMore" />
 
+            <CheckBox
+                android:id="@+id/cbDark"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/enableDarkMode"
+                android:textAlignment="viewStart"
+                android:textColor="@color/colorText"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
+                app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
+                app:layout_constraintTop_toBottomOf="@+id/cbGreetings" />
+
             <CheckBox
                 android:id="@+id/cbNotif"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/wantnotif"
+                android:text="@string/notificationsAndSync"
                 android:textAlignment="viewStart"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -254,7 +266,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/personalised"
                 android:textAlignment="viewStart"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="@+id/txtLayoutClasses"
                 app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -270,11 +282,11 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:backgroundTint="@color/accent"
-        android:text="@string/letsgo"
-        android:textColor="@color/background"
+        android:backgroundTint="@color/colorAccent"
+        android:text="@string/letsGo"
+        android:textColor="@color/colorBackground"
         app:icon="@drawable/ic_tick"
-        app:iconTint="@color/background"
+        app:iconTint="@color/colorBackground"
         android:layout_gravity="bottom|end"
         android:translationZ="-1dp"/>
 
@@ -282,7 +294,7 @@
         android:id="@+id/linearInflation"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="@color/colorBackground"
         android:orientation="vertical"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 1e81750..d64cc31 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -10,14 +10,14 @@
         android:id="@+id/appbarlayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/colorBackground"
         android:elevation="0dp">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="84dp"
-            app:titleTextColor="@color/accent"
+            app:titleTextColor="@color/colorAccent"
             app:contentInsetStart="0dp"
             android:elevation="0dp"
             app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
@@ -32,8 +32,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
                     android:fontFamily="@font/manrope_extrabold"
-                    android:text="@string/app_name"
-                    android:textColor="@color/accent"
+                    android:text="@string/appName"
+                    android:textColor="@color/colorAccent"
                     android:textSize="24sp"
                     android:singleLine="true"
                     android:layout_marginStart="16dp"
@@ -51,7 +51,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     android:layout_marginStart="16dp"
                     android:layout_marginBottom="4dp"
-                    android:textColor="@color/accent"
+                    android:textColor="@color/colorAccent"
                     android:textSize="18sp"
                     android:fontFamily="@font/manrope_semibold"/>
 
@@ -71,7 +71,7 @@
         android:layout_marginEnd="8dp"
         app:layout_anchor="@+id/bottom_nav"
         android:layout_gravity="top"
-        android:background="@color/lighthintcolor"
+        android:background="@color/colorHintLight"
         android:clickable="false"
         android:focusable="false"/>
 
@@ -83,10 +83,10 @@
         app:elevation="0dp"
         android:layout_gravity="bottom"
         app:menu="@menu/nav_items"
-        android:background="@color/background"
+        android:background="@color/colorBackground"
         app:itemIconTint="@color/bottom_nav_color"
         app:itemTextColor="@color/bottom_nav_color"
-        app:itemRippleColor="@color/accent"/>
+        app:itemRippleColor="@color/colorAccent"/>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordination"
diff --git a/app/src/main/res/layout/bg_colour_picker.xml b/app/src/main/res/layout/bg_colour_picker.xml
index 85efb17..12e3210 100644
--- a/app/src/main/res/layout/bg_colour_picker.xml
+++ b/app/src/main/res/layout/bg_colour_picker.xml
@@ -16,7 +16,7 @@
             android:id="@+id/def"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            app:strokeColor="@color/bggrey"
+            app:strokeColor="@color/bgGrey"
             app:strokeWidth="2dp"
             app:cornerRadius="16dp"/>
 
@@ -25,7 +25,7 @@
             android:id="@+id/red"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgred"
+            android:backgroundTint="@color/bgRed"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -33,7 +33,7 @@
             android:id="@+id/orange"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgorange"
+            android:backgroundTint="@color/bgOrange"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -41,7 +41,7 @@
             android:id="@+id/yellow"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgyellow"
+            android:backgroundTint="@color/bgYellow"
             app:cornerRadius="16dp"/>
 
     </TableRow>
@@ -55,7 +55,7 @@
             android:id="@+id/green"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bggreen"
+            android:backgroundTint="@color/bgGreen"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -63,7 +63,7 @@
             android:id="@+id/teal"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgteal"
+            android:backgroundTint="@color/bgTeal"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -71,7 +71,7 @@
             android:id="@+id/cyan"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgcyan"
+            android:backgroundTint="@color/bgCyan"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -79,7 +79,7 @@
             android:id="@+id/blue"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgblue"
+            android:backgroundTint="@color/bgBlue"
             app:cornerRadius="16dp"/>
 
     </TableRow>
@@ -93,7 +93,7 @@
             android:id="@+id/purple"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgpurple"
+            android:backgroundTint="@color/bgPurple"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -101,7 +101,7 @@
             android:id="@+id/pink"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgpink"
+            android:backgroundTint="@color/bgPink"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -109,7 +109,7 @@
             android:id="@+id/brown"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bgbrown"
+            android:backgroundTint="@color/bgBrown"
             app:cornerRadius="16dp"/>
 
         <com.google.android.material.button.MaterialButton
@@ -117,9 +117,9 @@
             android:id="@+id/grey"
             android:layout_margin="8dp"
             android:layout_weight="1"
-            android:backgroundTint="@color/bggrey"
+            android:backgroundTint="@color/bgGrey"
             app:cornerRadius="16dp"/>
 
     </TableRow>
 
-</TableLayout>
\ No newline at end of file
+</TableLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index ce3dc6e..6bbaa03 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -7,7 +7,7 @@
     tools:context=".Main"
     tools:showIn="@layout/app_bar_main"
     android:id="@+id/content"
-    android:background="@color/background"
+    android:background="@color/colorBackground"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="56dp"
-        android:background="@color/background"
+        android:background="@color/colorBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml
index 82b6305..b582e8f 100644
--- a/app/src/main/res/layout/content_settings.xml
+++ b/app/src/main/res/layout/content_settings.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/background"
+    android:background="@color/colorBackground"
     tools:context=".SettingsFragment">
 
     <androidx.core.widget.NestedScrollView
@@ -29,7 +29,7 @@
                 android:layout_marginTop="3dp"
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
-                android:backgroundTint="@color/lightbackground"
+                android:backgroundTint="@color/colorBackgroundLight"
                 app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -43,22 +43,22 @@
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="16dp"
                         android:text="@string/personalise"
-                        android:textColor="@color/accent"
+                        android:textColor="@color/colorAccent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/txtLayoutName"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        app:boxStrokeColor="@color/accent"
+                        app:boxStrokeColor="@color/colorAccent"
                         app:boxStrokeWidth="1dp"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginEnd="8dp"
-                        android:hint="@string/yourname"
-                        android:textColorHint="@color/hintcolor"
+                        android:hint="@string/yourName"
+                        android:textColorHint="@color/colorHint"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/txtPersonalise"
@@ -74,7 +74,7 @@
                             android:imeOptions="flagNoExtractUi"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true"
-                            android:textColor="@color/textcolor"
+                            android:textColor="@color/colorText"
                             android:textSize="14sp"/>
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -84,8 +84,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/disablegreeting"
-                        android:textColor="@color/textcolor"
+                        android:text="@string/enableGreeting"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtPersonalise"
                         app:layout_constraintTop_toBottomOf="@+id/txtLayoutName" />
@@ -94,8 +94,8 @@
                         android:id="@+id/txtJustnice"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/justnice"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/justBeingNice"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtGreeting"
                         app:layout_constraintTop_toBottomOf="@+id/txtGreeting" />
@@ -116,8 +116,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/darkbg"
-                        android:textColor="@color/textcolor"
+                        android:text="@string/darkBackground"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtGreeting"
                         app:layout_constraintTop_toBottomOf="@+id/txtJustnice" />
@@ -126,8 +126,8 @@
                         android:id="@+id/txtRestart"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/darkmode2"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/nightMode"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtDark"
                         app:layout_constraintTop_toBottomOf="@+id/txtDark" />
@@ -148,8 +148,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/customisecolor1"
-                        android:textColor="@color/textcolor"
+                        android:text="@string/customiseColoursTitle"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtRestart"
                         app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
@@ -159,8 +159,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
-                        android:text="@string/customisecolor2"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/customiseColoursIndividually"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="@+id/txtCustomiseColours1"
@@ -193,7 +193,7 @@
                 android:layout_marginTop="3dp"
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
-                android:backgroundTint="@color/lightbackground"
+                android:backgroundTint="@color/colorBackgroundLight"
                 app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -206,23 +206,23 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="16dp"
-                        android:text="@string/filter"
-                        android:textColor="@color/accent"
+                        android:text="@string/filters"
+                        android:textColor="@color/colorAccent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/txtLayoutClasses"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        app:boxStrokeColor="@color/accent"
+                        app:boxStrokeColor="@color/colorAccent"
                         app:boxStrokeWidth="1dp"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
                         android:layout_marginTop="8dp"
                         android:layout_marginEnd="8dp"
-                        android:hint="@string/classes"
-                        android:textColorHint="@color/hintcolor"
+                        android:hint="@string/grade"
+                        android:textColorHint="@color/colorHint"
                         app:layout_constraintEnd_toStartOf="@+id/chipHelpClasses"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/txtFilter"
@@ -238,7 +238,7 @@
                             android:imeOptions="flagNoExtractUi"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true"
-                            android:textColor="@color/textcolor"
+                            android:textColor="@color/colorText"
                             android:textSize="14sp"/>
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -249,7 +249,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="16dp"
                         android:src="@drawable/ic_qmark"
-                        android:tint="@color/textcolor"
+                        android:tint="@color/colorText"
                         android:backgroundTint="@android:color/transparent"
                         app:layout_constraintBottom_toBottomOf="@+id/txtLayoutClasses"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -264,8 +264,8 @@
                         android:layout_marginEnd="8dp"
                         android:hint="@string/courses"
                         android:importantForAutofill="no"
-                        android:textColorHint="@color/hintcolor"
-                        app:boxStrokeColor="@color/accent"
+                        android:textColorHint="@color/colorHint"
+                        app:boxStrokeColor="@color/colorAccent"
                         app:boxStrokeWidth="1dp"
                         app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
                         app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
@@ -281,7 +281,7 @@
                             android:imeOptions="flagNoExtractUi"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true"
-                            android:textColor="@color/textcolor"
+                            android:textColor="@color/colorText"
                             android:textSize="14sp" />
 
                     </com.google.android.material.textfield.TextInputLayout>
@@ -292,7 +292,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="16dp"
                         android:src="@drawable/ic_qmark"
-                        android:tint="@color/textcolor"
+                        android:tint="@color/colorText"
                         android:backgroundTint="@android:color/transparent"
                         app:layout_constraintBottom_toBottomOf="@+id/txtLayoutCourses"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -303,8 +303,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/notifications"
-                        android:textColor="@color/textcolor"
+                        android:text="@string/enableNotifications"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtFilter"
                         app:layout_constraintTop_toBottomOf="@+id/txtLayoutCourses" />
@@ -314,9 +314,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
-                        android:text="@string/notifiedabout"
+                        android:text="@string/enablesBackgroundSync"
                         android:textAlignment="textStart"
-                        android:textColor="@color/hintcolor"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtNotifications"
                         app:layout_constraintTop_toBottomOf="@+id/txtNotifications"
@@ -346,7 +346,7 @@
                 android:layout_marginTop="3dp"
                 android:layout_marginBottom="3dp"
                 app:cardElevation="2dp"
-                android:backgroundTint="@color/lightbackground"
+                android:backgroundTint="@color/colorBackgroundLight"
                 app:cardCornerRadius="12dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -360,7 +360,7 @@
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="16dp"
                         android:text="@string/misc"
-                        android:textColor="@color/accent"
+                        android:textColor="@color/colorAccent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -370,7 +370,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/personalised"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtMisc"
                         app:layout_constraintTop_toBottomOf="@+id/txtMisc" />
@@ -379,8 +379,8 @@
                         android:id="@+id/txtDefaultsTo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/defplan"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/defaultsToPlan"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtPersonalised"
                         app:layout_constraintTop_toBottomOf="@+id/txtPersonalised" />
@@ -402,7 +402,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/openInfo"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtDefaultsTo"
                         app:layout_constraintTop_toBottomOf="@+id/txtDefaultsTo" />
@@ -411,8 +411,8 @@
                         android:id="@+id/txtOpenInfoTwo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/openInfoTwo"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/openInfoNoUserInput"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtOpenInfo"
                         app:layout_constraintTop_toBottomOf="@+id/txtOpenInfo" />
@@ -434,7 +434,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/autoRefresh"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtOpenInfoTwo"
                         app:layout_constraintTop_toBottomOf="@+id/txtOpenInfoTwo" />
@@ -443,8 +443,8 @@
                         android:id="@+id/txtAutoRefreshTwo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/autoRefreshTwo"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/ifSyncNotWorking"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtAutoRefresh"
                         app:layout_constraintTop_toBottomOf="@+id/txtAutoRefresh" />
@@ -465,8 +465,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
-                        android:text="@string/visitweb"
-                        android:textColor="@color/textcolor"
+                        android:text="@string/visitWebsite"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtAutoRefreshTwo"
                         app:layout_constraintTop_toBottomOf="@+id/txtAutoRefreshTwo" />
@@ -475,8 +475,8 @@
                         android:id="@+id/txtWeb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/butwhy"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/ifYouNeedTo"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtVisitWeb"
                         app:layout_constraintTop_toBottomOf="@+id/txtVisitWeb" />
@@ -503,7 +503,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/licences"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtWeb"
                         app:layout_constraintTop_toBottomOf="@+id/txtWeb" />
@@ -512,8 +512,8 @@
                         android:id="@+id/txtWhatittook"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/whatittook"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/whatItTook"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtLicences"
                         app:layout_constraintTop_toBottomOf="@+id/txtLicences" />
@@ -539,7 +539,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/tac"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtLicences"
                         app:layout_constraintTop_toBottomOf="@+id/txtWhatittook"/>
@@ -548,8 +548,8 @@
                         android:id="@+id/txtTermsTwo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/tactwo"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/reviewTac"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtTerms"
                         app:layout_constraintTop_toBottomOf="@+id/txtTerms" />
@@ -577,7 +577,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/privacy"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtTermsTwo"
                         app:layout_constraintTop_toBottomOf="@+id/txtTermsTwo" />
@@ -586,8 +586,8 @@
                         android:id="@+id/txtPrivacyPTwo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/privacytwo"
-                        android:textColor="@color/hintcolor"
+                        android:text="@string/reviewPrivacy"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         app:layout_constraintStart_toStartOf="@+id/txtPrivacyP"
                         app:layout_constraintTop_toBottomOf="@+id/txtPrivacyP" />
@@ -614,7 +614,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:text="@string/version"
-                        android:textColor="@color/textcolor"
+                        android:textColor="@color/colorText"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="@+id/txtPrivacyPTwo"
                         app:layout_constraintTop_toBottomOf="@+id/txtPrivacyPTwo" />
@@ -624,7 +624,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="16dp"
-                        android:textColor="@color/hintcolor"
+                        android:textColor="@color/colorHint"
                         android:textSize="12sp"
                         android:fontFeatureSettings="tnum"
                         app:layout_constraintStart_toStartOf="@+id/txtVersion"
diff --git a/app/src/main/res/layout/course_card.xml b/app/src/main/res/layout/course_card.xml
index d880029..4467eea 100644
--- a/app/src/main/res/layout/course_card.xml
+++ b/app/src/main/res/layout/course_card.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/lightbackground"
+    app:cardBackgroundColor="@color/colorBackgroundLight"
     app:cardCornerRadius="12dp"
     android:clickable="true"
     android:focusable="true"
@@ -29,7 +29,7 @@
             app:layout_constraintEnd_toStartOf="@+id/date"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:textColor="@color/textcolor"/>
+            android:textColor="@color/colorText"/>
 
         <TextView
             android:id="@+id/date"
@@ -38,7 +38,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:textAlignment="textEnd"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintWidth_max="200dp"/>
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:textAlignment="textEnd"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintEnd_toEndOf="@+id/date"
             app:layout_constraintTop_toBottomOf="@+id/date"
             app:layout_constraintWidth_max="200dp" />
@@ -61,7 +61,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintEnd_toStartOf="@+id/time"
             app:layout_constraintStart_toEndOf="@+id/iconView"
             app:layout_constraintTop_toBottomOf="@+id/group" />
@@ -73,7 +73,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="16dp"
             android:textAlignment="textEnd"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/time"
             app:layout_constraintTop_toBottomOf="@+id/time"
@@ -87,7 +87,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="16dp"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/room"
             app:layout_constraintStart_toStartOf="parent"
@@ -98,7 +98,7 @@
             android:layout_width="20dp"
             android:layout_height="0dp"
             android:layout_marginStart="16dp"
-            android:tint="@color/textcolor"
+            android:tint="@color/colorText"
             app:layout_constraintBottom_toBottomOf="@+id/course"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/course" />
diff --git a/app/src/main/res/layout/diagnostics_dialog.xml b/app/src/main/res/layout/diagnostics_dialog.xml
index e011d25..fb9a5c4 100644
--- a/app/src/main/res/layout/diagnostics_dialog.xml
+++ b/app/src/main/res/layout/diagnostics_dialog.xml
@@ -15,7 +15,7 @@
         android:textSize="22sp"
         android:fontFamily="@font/manrope_semibold"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
     <androidx.core.widget.NestedScrollView
@@ -32,7 +32,7 @@
                 android:id="@+id/dialogtext"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:paddingStart="24dp"
                 android:paddingEnd="24dp"
                 android:paddingBottom="24dp"
@@ -42,8 +42,8 @@
                 android:id="@+id/btnResetLaunch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/accent"
-                app:strokeColor="@color/accent"
+                android:textColor="@color/colorAccent"
+                app:strokeColor="@color/colorAccent"
                 app:strokeWidth="2dp"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="24dp"
@@ -54,8 +54,8 @@
                 android:id="@+id/btnResetNotif"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/accent"
-                app:strokeColor="@color/accent"
+                android:textColor="@color/colorAccent"
+                app:strokeColor="@color/colorAccent"
                 app:strokeWidth="2dp"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="24dp"
diff --git a/app/src/main/res/layout/edittext_dialog.xml b/app/src/main/res/layout/edittext_dialog.xml
index c03c6db..5d33f11 100644
--- a/app/src/main/res/layout/edittext_dialog.xml
+++ b/app/src/main/res/layout/edittext_dialog.xml
@@ -15,7 +15,7 @@
         android:textSize="22sp"
         android:fontFamily="@font/manrope_semibold"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
     <androidx.core.widget.NestedScrollView
@@ -36,24 +36,24 @@
                 android:id="@+id/dialogtext"
                 android:layout_height="match_parent"
                 android:layout_width="wrap_content"
-                android:textColor="@color/textcolor"/>
+                android:textColor="@color/colorText"/>
 
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxStrokeColor="@color/accent"
+                app:boxStrokeColor="@color/colorAccent"
                 app:boxStrokeWidth="1dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
-                android:textColorHint="@color/hintcolor"
+                android:textColorHint="@color/colorHint"
                 android:importantForAutofill="no">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/dialog_edittext"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/textcolor"
+                    android:textColor="@color/colorText"
                     android:ems="10"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textNoSuggestions"
@@ -65,10 +65,10 @@
                 android:id="@+id/dialog_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/accent"
-                android:text="@string/positivebutton"
+                android:textColor="@color/colorAccent"
+                android:text="@string/apply"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                app:strokeColor="@color/accent"
+                app:strokeColor="@color/colorAccent"
                 app:strokeWidth="2dp"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/empty_dialog.xml b/app/src/main/res/layout/empty_dialog.xml
index d647d2b..909823f 100644
--- a/app/src/main/res/layout/empty_dialog.xml
+++ b/app/src/main/res/layout/empty_dialog.xml
@@ -13,7 +13,7 @@
         android:textSize="22sp"
         android:fontFamily="@font/manrope_semibold"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
     <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/food_layout.xml b/app/src/main/res/layout/food_layout.xml
index ec2a5c7..fabf8ac 100644
--- a/app/src/main/res/layout/food_layout.xml
+++ b/app/src/main/res/layout/food_layout.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/background">
+    android:background="@color/colorBackground">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/linear_food"
diff --git a/app/src/main/res/layout/forever_alone_button.xml b/app/src/main/res/layout/forever_alone_button.xml
deleted file mode 100644
index 918d836..0000000
--- a/app/src/main/res/layout/forever_alone_button.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    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"
-        app:strokeColor="@color/textcolor"
-        app:strokeWidth="2dp"
-        android:textColor="@color/textcolor"
-        android:text="@string/clearall"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="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/just_a_card.xml b/app/src/main/res/layout/just_a_card.xml
index 4c19137..9ba0056 100644
--- a/app/src/main/res/layout/just_a_card.xml
+++ b/app/src/main/res/layout/just_a_card.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:backgroundTint="@color/lightbackground"
+    android:backgroundTint="@color/colorBackgroundLight"
     app:cardCornerRadius="12dp"
     android:clickable="true"
     android:focusable="true"
@@ -22,7 +22,7 @@
             android:id="@+id/cardInfoText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 86b6dd6..3c8edde 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/lightbackground"
+    app:cardBackgroundColor="@color/colorBackgroundLight"
     app:cardCornerRadius="8dp"
     android:clickable="true"
     android:focusable="true"
@@ -25,7 +25,7 @@
             android:layout_height="24dp"
             android:layout_margin="16dp"
             android:layout_marginStart="8dp"
-            android:tint="@color/textcolor"
+            android:tint="@color/colorText"
             app:layout_constraintBottom_toBottomOf="@+id/item_text"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/item_text" />
@@ -39,7 +39,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="16dp"
             android:textAlignment="viewStart"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/item_image"
diff --git a/app/src/main/res/layout/plan.xml b/app/src/main/res/layout/plan.xml
index 074afda..0c7c027 100644
--- a/app/src/main/res/layout/plan.xml
+++ b/app/src/main/res/layout/plan.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/background">
+    android:background="@color/colorBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,17 +26,17 @@
                 android:text=":("
                 android:textSize="60dp"
                 android:layout_gravity="center"
-                android:textColor="@color/hintcolor"
+                android:textColor="@color/colorHint"
                 android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/smileydowntext"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/nosubst"
+                android:text="@string/noSubstitutionsForYou"
                 app:layout_anchor="@+id/smileydown"
                 android:layout_gravity="bottom|center_horizontal"
-                android:textColor="@color/hintcolor"
+                android:textColor="@color/colorHint"
                 android:visibility="gone"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/recycler_dialog.xml b/app/src/main/res/layout/recycler_dialog.xml
index e4d23c4..d48f0b3 100644
--- a/app/src/main/res/layout/recycler_dialog.xml
+++ b/app/src/main/res/layout/recycler_dialog.xml
@@ -13,7 +13,7 @@
         android:textSize="22sp"
         android:fontFamily="@font/manrope_semibold"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/secret_dialog.xml b/app/src/main/res/layout/secret_dialog.xml
index 8c4f34e..857709d 100644
--- a/app/src/main/res/layout/secret_dialog.xml
+++ b/app/src/main/res/layout/secret_dialog.xml
@@ -13,7 +13,7 @@
         android:fontFamily="@font/manrope_semibold"
         android:textSize="22sp"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
     <androidx.core.widget.NestedScrollView
@@ -30,7 +30,7 @@
                 android:id="@+id/dialogtext"
                 android:layout_height="match_parent"
                 android:layout_width="wrap_content"
-                android:textColor="@color/textcolor"
+                android:textColor="@color/colorText"
                 android:paddingStart="24dp"
                 android:paddingEnd="24dp"
                 android:paddingBottom="4dp"
diff --git a/app/src/main/res/layout/simple_dialog.xml b/app/src/main/res/layout/simple_dialog.xml
index f627f31..4cc44b9 100644
--- a/app/src/main/res/layout/simple_dialog.xml
+++ b/app/src/main/res/layout/simple_dialog.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/lightbackground">
+    android:background="@color/colorBackgroundLight">
 
     <TextView
         android:id="@+id/textviewtitle"
@@ -14,7 +14,7 @@
         android:fontFamily="@font/manrope_semibold"
         android:textSize="22sp"
         android:layout_gravity="start"
-        android:textColor="@color/textcolor"
+        android:textColor="@color/colorText"
         android:textAlignment="center"/>
 
     <androidx.core.widget.NestedScrollView
@@ -26,7 +26,7 @@
             android:id="@+id/dialogtext"
             android:layout_height="match_parent"
             android:layout_width="wrap_content"
-            android:textColor="@color/textcolor"
+            android:textColor="@color/colorText"
             android:paddingStart="24dp"
             android:paddingEnd="24dp"
             android:paddingBottom="24dp"
diff --git a/app/src/main/res/layout/welcome_screen.xml b/app/src/main/res/layout/welcome_screen.xml
index fdb9936..d81ec1f 100644
--- a/app/src/main/res/layout/welcome_screen.xml
+++ b/app/src/main/res/layout/welcome_screen.xml
@@ -28,7 +28,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:text="@string/havefun"
+        android:text="@string/haveFun"
         android:textAlignment="center"
         android:textSize="30sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -44,6 +44,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:background="@color/accent"/>
+        android:background="@color/colorAccent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_items.xml b/app/src/main/res/menu/nav_items.xml
index 9847d88..e448829 100644
--- a/app/src/main/res/menu/nav_items.xml
+++ b/app/src/main/res/menu/nav_items.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/plan"
         android:icon="@drawable/ic_writing"
-        android:title="@string/plan"
+        android:title="@string/general"
         android:enabled="true"/>
     <item
         android:id="@+id/personal"
@@ -14,7 +14,7 @@
     <item
         android:id="@+id/openinfopanel"
         android:icon="@drawable/ic_information"
-        android:title=""
+        android:title="@string/information"
         android:enabled="true"/>
     <item
         android:id="@+id/menu"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c27fecc..635f7e9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,78 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">AvH-Plan</string>
-    <string name="filter">Filter</string>
-    <string name="nointernet">Keine Internetverbindung</string>
+    <string name="appName">AvH-Plan</string>
+    <string name="filters">Filter</string>
+    <string name="noInternet">Keine Internetverbindung</string>
     <string name="general">Allgemein</string>
-    <string name="classes">Klasse</string>
+    <string name="grade">Klasse</string>
     <string name="courses">Kurse</string>
-    <string name="subst">Vertretungsplan</string>
+    <string name="substitutionPlan">Vertretungsplan</string>
     <string name="personal">Persönlich</string>
     <string name="settings">Einstellungen</string>
-    <string name="plan">Allgemein</string>
-    <string name="darkbg">Dunkler Hintergrund</string>
-    <string name="notifications">Aktiviere Benachrichtigungen</string>
-    <string name="notifiedabout">Aktiviert ebenfalls Hintergrund-Sync</string>
-    <string name="personalplan">Persönlicher Plan</string>
+    <string name="darkBackground">Dunkler Hintergrund</string>
+    <string name="enableNotifications">Aktiviere Benachrichtigungen</string>
+    <string name="enablesBackgroundSync">Aktiviert ebenfalls Hintergrund-Sync</string>
+    <string name="personalPlan">Persönlicher Plan</string>
     <string name="personalise">Personalisieren</string>
     <string name="misc">Diverses</string>
-    <string name="defplan">Standardmäßig ansonsten allgemeiner Plan</string>
+    <string name="defaultsToPlan">Standardmäßig ansonsten allgemeiner Plan</string>
     <string name="personalised">Persönlicher Plan als Standard</string>
-    <string name="visitweb">Besuche die Schulwebsite</string>
-    <string name="butwhy">Falls nötig</string>
+    <string name="visitWebsite">Besuche die Schulwebsite</string>
+    <string name="ifYouNeedTo">Falls nötig</string>
     <string name="menu">Menü</string>
-    <string name="foodmenu">Speiseplan</string>
-    <string name="letsgo">Los geht\'s!</string>
+    <string name="foodMenu">Speiseplan</string>
+    <string name="letsGo">Los geht\'s!</string>
     <string name="welcome">Willkommen!</string>
-    <string name="firstsomethings">Lass uns erst einige Sachen einrichten.</string>
-    <string name="tellmename">Nenne mir deinen Namen.</string>
-    <string name="yourname">Dein Name</string>
-    <string name="nextclass">Sag mir als nächstes, in welcher Klasse du bist.</string>
-    <string name="yourclass">Deine Klasse</string>
-    <string name="seniorsetup">Falls du in der Oberstufe bist, nenne mir bitte auch deine Kurse.</string>
-    <string name="yourcourses">Deine Kurse</string>
-    <string name="moresettings">Nur noch ein paar weitere Einstellungen.</string>
-    <string name="enabledarkmode">Dunklen Hintergrund aktivieren</string>
-    <string name="havefun">Viel Spaß!</string>
-    <string name="disablegreeting">Aktiviere Begrüßungen</string>
-    <string name="justnice">Falls du möchtest, dass ich nett bin :)</string>
+    <string name="firstSomeThings">Lass uns erst einige Sachen einrichten.</string>
+    <string name="tellMeYourName">Nenne mir deinen Namen.</string>
+    <string name="yourName">Dein Name</string>
+    <string name="nextGrade">Sag mir als nächstes, in welcher Klasse du bist.</string>
+    <string name="yourGrade">Deine Klasse</string>
+    <string name="seniorCourses">Falls du in der Oberstufe bist, nenne mir bitte auch deine Kurse.</string>
+    <string name="yourCourses">Deine Kurse</string>
+    <string name="moreSettings">Nur noch ein paar weitere Einstellungen.</string>
+    <string name="enableDarkMode">Dunklen Hintergrund aktivieren</string>
+    <string name="haveFun">Viel Spaß!</string>
+    <string name="enableGreeting">Aktiviere Begrüßungen</string>
+    <string name="justBeingNice">Falls du möchtest, dass ich nett bin :)</string>
     <string name="splan">s Plan</string>
     <string name="nosplan">\' Plan</string>
     <string name="licences">Lizenzen</string>
-    <string name="whatittook">Was die App ausmacht</string>
+    <string name="whatItTook">Was die App ausmacht</string>
     <string name="version">Versionsnummer</string>
     <string name="privacy">Datenschutzerklärung</string>
     <string name="tac">AGB</string>
-    <string name="tactwo">Überprüfe die AGB der App (Englisch)</string>
-    <string name="privacytwo">Überprüfe die Datenschutzerklärung der App (Englisch)</string>
-    <string name="noinfo">Keine Informationen verfügbar</string>
+    <string name="reviewTac">Überprüfe die AGB der App (Englisch)</string>
+    <string name="reviewPrivacy">Überprüfe die Datenschutzerklärung der App (Englisch)</string>
+    <string name="noInfoAvailable">Keine Informationen verfügbar</string>
     <string name="information">Informationen</string>
-    <string name="devby">Entwickelt von Deniz :)</string>
+    <string name="madeBy">Entwickelt von Deniz :)</string>
     <string name="openInfo">Öffne Info bei App-Start</string>
-    <string name="openInfoTwo">Öffnet automatisch ohne Nutzereingabe</string>
+    <string name="openInfoNoUserInput">Öffnet automatisch ohne Nutzereingabe</string>
     <string name="autoRefresh">Aktualisiere Plan bei App-Start</string>
-    <string name="autoRefreshTwo">Falls Hintergrund-Sync nicht funktioniert</string>
-    <string name="helpCoursesTitle">Wie du deine Kurse eintragen kannst</string>
-    <string name="helpClassesTitle">Wie du deine Klasse eintragen kannst</string>
-    <string name="helpCourses">Trag die Kürzel für die Kurse ein, welche in deinem persönlichen Plan auftauchen sollen und über welche du benachrichtigt werden möchtest. Du kannst diese auf deinem Stundenplan finden.\n\nHier sind einige Beispiele:\n\nMathe in der 5. Klasse (Mittelstufe) wäre MAT.\n\nDer Englisch-Profilkurs in der E-Phase könnte ENP1 sein.\n\nDer Bio-Grundkurs in der Q1 ist z.B. bio1.\n\nMeist müssen Kurse für Mittelstufenschüler nicht eingetragen werden.\nTrenne mehrere Kurse mit Leerzeichen, Kommas sind optional.\nGroß- und Kleinschreibung wird beachtet.</string>
-    <string name="helpClasses">Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht und über Aktualisierungen informiert zu werden.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen können nur eingetragen werden, wenn keine Kurse eingetragen sind.</string>
-    <string name="donttell">Er darf das nicht erfahren :0</string>
-    <string name="fortest">Dieses Menü ist derzeit nur für Tests gedacht. Zusätzliche Funktionalität könnte in der Zukunft hinzugefügt werden. Probier\' gerne zufällige Codes aus.</string>
-    <string name="positivebutton">Anwenden</string>
-    <string name="nothinghappened">Ungültiger Code</string>
-    <string name="experimentalmenu">Experimentalmenü</string>
-    <string name="diagnosticsmenu">Diagnosemenü</string>
-    <string name="calculate">Berechnen</string>
-    <string name="boy">Junge</string>
-    <string name="girl">Mädchen</string>
-    <string name="dating">Q1-Matchmaker</string>
-    <string name="error">Ein Fehler ist aufgetreten!</string>
-    <string name="wantnotif">Benachrichtigungen und Hintergrund-Synchronisation aktivieren</string>
-    <string name="nosubst">Kein Entfall für dich</string>
-    <string name="chinaDialog">Einige chinesische Hersteller, wie Huawei/Honor und Xiaomi, unterdrücken Hintergrund-Services, weshalb Benachrichtungen und Hintergrund-Synchronisation nicht funktionieren.\n\nIch habe feststellen müssen, dass es keine einfache Lösung dafür gibt, die ich einbauen könnte.\n\nStattdessen kannst du jedoch versuchen, App-Optimierungen für diese App zu deaktivieren:\n\nSchließe die App und öffne \"Einstellungen\" -> \"Apps\" -> \"AvH-Plan\" -> \"Akku\" -> \"App-Start\" -> \"Automatisch verwalten\" deaktivieren, \"Im Hintergrund ausführen\" aktivieren.\n\nDies kann unter Umständen keinen Einfluss haben.</string>
-    <string name="chinaTitle">Informationen bezüglich deines Gerätes</string>
-    <string name="customisecolor1">Benutzerdefinierte Farben</string>
-    <string name="customisecolor2">Farben für jedes Fach einstellen</string>
+    <string name="ifSyncNotWorking">Falls Hintergrund-Sync nicht funktioniert</string>
+    <string name="enterCoursesHelpTitle">Wie du deine Kurse eintragen kannst</string>
+    <string name="enterGradeHelpTitle">Wie du deine Klasse eintragen kannst</string>
+    <string name="enterCoursesHelp">Trag die Kürzel für die Kurse ein, welche in deinem persönlichen Plan auftauchen sollen und über welche du benachrichtigt werden möchtest. Du kannst diese auf deinem Stundenplan finden.\n\nHier sind einige Beispiele:\n\nMathe in der 5. Klasse (Mittelstufe) wäre MAT.\n\nDer Englisch-Profilkurs in der E-Phase könnte ENP1 sein.\n\nDer Bio-Grundkurs in der Q1 ist z.B. bio1.\n\nMeist müssen Kurse für Mittelstufenschüler nicht eingetragen werden.\nTrenne mehrere Kurse mit Leerzeichen, Kommas sind optional.\nGroß- und Kleinschreibung wird beachtet.</string>
+    <string name="enterGradeHelp">Trage deine derzeitige Klasse ein, damit sie in deinem persönlichen Plan auftaucht und über Aktualisierungen informiert zu werden.\n\nAnmerkung:\n\nIn der Mittelstufe müssen Nummer und Buchstabe zusammen geschrieben werden, Beispiel: \"5a\".\n\nIn der E-Phase müssen diese durch ein Leerzeichen getrennt werden, Beispiel: \"18 a\".\n\nIn der Q1/Q2 sollen nur die Nummern eingetragen werden, Beispiel: \"17\".\n\nMehrere Klassen können nur eingetragen werden, wenn keine Kurse eingetragen sind.</string>
+    <string name="dontTellHim">Er darf das nicht erfahren :0</string>
+    <string name="menuForTests">Dieses Menü ist derzeit nur für Tests gedacht. Zusätzliche Funktionalität könnte in der Zukunft hinzugefügt werden. Probier\' gerne zufällige Codes aus.</string>
+    <string name="apply">Anwenden</string>
+    <string name="invalidCode">Ungültiger Code</string>
+    <string name="experimentalMenu">Experimentalmenü</string>
+    <string name="diagnosticsMenu">Diagnosemenü</string>
+    <string name="notificationsAndSync">Benachrichtigungen und Hintergrund-Synchronisation aktivieren</string>
+    <string name="noSubstitutionsForYou">Kein Entfall für dich</string>
+    <string name="chineseDevicesHelp">Einige chinesische Hersteller, wie Huawei/Honor und Xiaomi, unterdrücken Hintergrund-Services, weshalb Benachrichtungen und Hintergrund-Synchronisation nicht funktionieren.\n\nIch habe feststellen müssen, dass es keine einfache Lösung dafür gibt, die ich einbauen könnte.\n\nStattdessen kannst du jedoch versuchen, App-Optimierungen für diese App zu deaktivieren:\n\nSchließe die App und öffne \"Einstellungen\" -> \"Apps\" -> \"AvH-Plan\" -> \"Akku\" -> \"App-Start\" -> \"Automatisch verwalten\" deaktivieren, \"Im Hintergrund ausführen\" aktivieren.\n\nDies kann unter Umständen keinen Einfluss haben.</string>
+    <string name="chineseDevicesTitle">Informationen bezüglich deines Gerätes</string>
+    <string name="customiseColoursTitle">Benutzerdefinierte Farben</string>
+    <string name="customiseColoursIndividually">Farben für jedes Fach einstellen</string>
     <string name="courseDeu">Deutsch (+ DAZ)</string>
     <string name="courseMat">Mathematik</string>
     <string name="courseEng">Englisch (+ ENA)</string>
@@ -98,16 +92,12 @@
     <string name="courseWat">WAT</string>
     <string name="courseFor">Förderunterricht</string>
     <string name="courseWp">WP &amp; Methodenstunde</string>
-    <string name="clearall">Alle löschen</string>
-    <string name="allcolourscleared">Farben für alle Kurse wurden gelöscht</string>
-    <string name="chromecompatible">Kein Chrome-kompatibler Browser gefunden</string>
-    <string name="noyoutube">YouTube-App nicht gefunden</string>
-    <string name="swipeindependent">Unabhängig von Wischgeste</string>
-    <string name="showinfo">Zeige Info-Tab in Navigationsleisete</string>
-    <string name="lastupdatedK">"Zuletzt aktualisiert: "</string>
-    <string name="darkmode2">Aktiviert den Nachtmodus</string>
-    <string name="yourplan">Dein Plan</string>
-    <string-array name="greetings_morning">
+    <string name="chromeCompatibleNotFound">Kein Chrome-kompatibler Browser gefunden</string>
+    <string name="youtubeNotFound">YouTube-App nicht gefunden</string>
+    <string name="lastUpdated">"Zuletzt aktualisiert: "</string>
+    <string name="nightMode">Aktiviert den Nachtmodus</string>
+    <string name="yourPlan">Dein Plan</string>
+    <string-array name="greetingsMorning">
         <item>Guten Morgen, %s!</item>
         <item>Hab einen schönen Tag, %s.</item>
         <item>Wie geht\'s dir, %s?</item>
@@ -117,7 +107,7 @@
         <item>Schön dich zu sehen, %s.</item>
         <item>Wie geht\'s dir so, %s?</item>
     </string-array>
-    <string-array name="greetings_noon">
+    <string-array name="greetingsNoon">
         <item>Guten Tag, %s!</item>
         <item>Einen schönen Tag noch, %s.</item>
         <item>Wie geht\'s dir, %s?</item>
@@ -127,7 +117,7 @@
         <item>Schön dich zu sehen, %s.</item>
         <item>Genieß\' deinen Tag, %s.</item>
     </string-array>
-    <string-array name="greetings_evening">
+    <string-array name="greetingsEvening">
         <item>Good evening, %s!</item>
         <item>Enjoy your evening, %s.</item>
         <item>Wie geht\'s dir, %s?</item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a4c692f..45f3588 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="background">#121212</color>
-    <color name="lightbackground">#222222</color>
-    <color name="accent">#64b5f6</color>
-    <color name="textcolor">#e0e0e0</color>
-    <color name="hintcolor">#9e9e9e</color>
-    <color name="lighthintcolor">#313131</color>
+    <color name="colorBackground">#121212</color>
+    <color name="colorBackgroundLight">#222222</color>
+    <color name="colorAccent">#64b5f6</color>
+    <color name="colorText">#e0e0e0</color>
+    <color name="colorHint">#9e9e9e</color>
+    <color name="colorHintLight">#313131</color>
 
-    <color name="bgred">#5B2B2A</color>
-    <color name="bgorange">#604A1D</color>
-    <color name="bgyellow">#635C1F</color>
-    <color name="bggreen">#355823</color>
-    <color name="bgteal">#19504B</color>
-    <color name="bgcyan">#125a6d</color>
-    <color name="bgblue">#1F3B5E</color>
-    <color name="bgpurple">#42295D</color>
-    <color name="bgpink">#5A2345</color>
-    <color name="bgbrown">#442F1B</color>
-    <color name="bggrey">#3C3F43</color>
+    <color name="bgRed">#5B2B2A</color>
+    <color name="bgOrange">#604A1D</color>
+    <color name="bgYellow">#635C1F</color>
+    <color name="bgGreen">#355823</color>
+    <color name="bgTeal">#19504B</color>
+    <color name="bgCyan">#125a6d</color>
+    <color name="bgBlue">#1F3B5E</color>
+    <color name="bgPurple">#42295D</color>
+    <color name="bgPink">#5A2345</color>
+    <color name="bgBrown">#442F1B</color>
+    <color name="bgGrey">#3C3F43</color>
 
-    <color name="splash_logo">@color/textcolor</color>
+    <color name="colorSplashLogo">@color/colorText</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ad73df..fddc9d7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <color name="background">#e0e0e0</color>
-    <color name="lightbackground">#f5f5f5</color>
-    <color name="accent">#448aff</color>
-    <color name="textcolor">#212121</color>
-    <color name="hintcolor">#757575</color>
-    <color name="lighthintcolor">#bdbdbd</color>
+    <color name="colorBackground">#e0e0e0</color>
+    <color name="colorBackgroundLight">#f5f5f5</color>
+    <color name="colorAccent">#448aff</color>
+    <color name="colorText">#212121</color>
+    <color name="colorHint">#757575</color>
+    <color name="colorHintLight">#bdbdbd</color>
 
-    <color name="alwaysWhite">#f5f5f5</color>
-
-    <color name="bgred">#F28B82</color>
-    <color name="bgorange">#FBBC04</color>
-    <color name="bgyellow">#FFF475</color>
-    <color name="bggreen">#CCFF90</color>
-    <color name="bgteal">#A7FFEB</color>
-    <color name="bgcyan">#CBF0F8</color>
-    <color name="bgblue">#AECBFA</color>
-    <color name="bgpurple">#D7AEFB</color>
-    <color name="bgpink">#FDCFE8</color>
-    <color name="bgbrown">#E6C9A8</color>
-    <color name="bggrey">#BDBDBD</color>
+    <color name="bgRed">#F28B82</color>
+    <color name="bgOrange">#FBBC04</color>
+    <color name="bgYellow">#FFF475</color>
+    <color name="bgGreen">#CCFF90</color>
+    <color name="bgTeal">#A7FFEB</color>
+    <color name="bgCyan">#CBF0F8</color>
+    <color name="bgBlue">#AECBFA</color>
+    <color name="bgPurple">#D7AEFB</color>
+    <color name="bgPink">#FDCFE8</color>
+    <color name="bgBrown">#E6C9A8</color>
+    <color name="bgGrey">#BDBDBD</color>
 
     <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#757575</color>
 
-    <color name="splash_logo">@color/accent</color>
+    <color name="colorSplashLogo">@color/colorAccent</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46a05aa..8bc928b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,89 +1,83 @@
 <resources>
-    <string name="app_name">AvH Plan</string>
-    <string name="subst">Substitution Plan</string>
-    <string name="filter">Filters</string>
-    <string name="nointernet">No internet connection</string>
+    <string name="appName">AvH Plan</string>
+    <string name="substitutionPlan">Substitution Plan</string>
+    <string name="filters">Filters</string>
+    <string name="noInternet">No internet connection</string>
     <string name="general">General</string>
-    <string name="classes">Grade</string>
+    <string name="grade">Grade</string>
     <string name="courses">Courses</string>
 
     <string name="personal">Personal</string>
     <string name="settings">Settings</string>
-    <string name="plan">General</string>
 
     <!-- for Settings fragment -->
-    <string name="darkbg">Dark background</string>
-    <string name="notifications">Enable notifications</string>
-    <string name="notifiedabout">Also enables background sync</string>
+    <string name="darkBackground">Dark background</string>
+    <string name="enableNotifications">Enable notifications</string>
+    <string name="enablesBackgroundSync">Also enables background sync</string>
 
-    <string name="personalplan">Personal Plan</string>
+    <string name="personalPlan">Personal Plan</string>
     <string name="personalise">Personalise</string>
     <string name="misc">Miscellaneous</string>
     <string name="personalised">Set personalised plan as default</string>
-    <string name="defplan">Defaults to general plan otherwise</string>
-    <string name="visitweb">Visit the school\'s website</string>
-    <string name="butwhy">In case you need to</string>
+    <string name="defaultsToPlan">Defaults to general plan otherwise</string>
+    <string name="visitWebsite">Visit the school\'s website</string>
+    <string name="ifYouNeedTo">In case you need to</string>
     <string name="menu">Menu</string>
-    <string name="foodmenu">Food Menu</string>
-    <string name="letsgo">Let\'s Go!</string>
+    <string name="foodMenu">Food Menu</string>
+    <string name="letsGo">Let\'s Go!</string>
     <string name="welcome">Welcome!</string>
-    <string name="firstsomethings">First, let\'s setup some things.</string>
-    <string name="tellmename">Tell me your name.</string>
-    <string name="yourname">Your name</string>
-    <string name="nextclass">Next, tell me which grade you\'re in.</string>
-    <string name="yourclass">Your grade</string>
-    <string name="seniorsetup">If you\'re in senior phase, please also tell me which courses you\'re enrolled in.</string>
-    <string name="yourcourses">Your courses</string>
-    <string name="moresettings">Lastly, just a few more settings.</string>
-    <string name="wantnotif">Receive notifications and enable background sync</string>
-    <string name="enabledarkmode">Enable dark mode</string>
-    <string name="havefun">Have fun!</string>
+    <string name="firstSomeThings">First, let\'s setup some things.</string>
+    <string name="tellMeYourName">Tell me your name.</string>
+    <string name="yourName">Your name</string>
+    <string name="nextGrade">Next, tell me which grade you\'re in.</string>
+    <string name="yourGrade">Your grade</string>
+    <string name="seniorCourses">If you\'re in senior phase, please also tell me which courses you\'re enrolled in.</string>
+    <string name="yourCourses">Your courses</string>
+    <string name="moreSettings">Lastly, just a few more settings.</string>
+    <string name="notificationsAndSync">Receive notifications and enable background sync</string>
+    <string name="enableDarkMode">Enable dark mode</string>
+    <string name="haveFun">Have fun!</string>
 
-    <string name="disablegreeting">Enable greeting</string>
-    <string name="justnice">If you want me to be nice :)</string>
+    <string name="enableGreeting">Enable greeting</string>
+    <string name="justBeingNice">If you want me to be nice :)</string>
     <string name="splan">\'s Plan</string>
     <string name="nosplan">\' Plan</string>
 
     <string name="licences">Licences</string>
-    <string name="whatittook">What it took to create this app</string>
+    <string name="whatItTook">What it took to create this app</string>
     <string name="version">Version Number</string>
 
     <string name="tac">Terms &amp; Conditions</string>
-    <string name="tactwo">Review this app\'s Terms &amp; Conditions</string>
+    <string name="reviewTac">Review this app\'s Terms &amp; Conditions</string>
     <string name="privacy">Privacy Policy</string>
-    <string name="privacytwo">Review this app\'s Privacy Policy</string>
-    <string name="noinfo">No information available</string>
+    <string name="reviewPrivacy">Review this app\'s Privacy Policy</string>
+    <string name="noInfoAvailable">No information available</string>
     <string name="information">Information</string>
 
-    <string name="devby">Made by Deniz :)</string>
+    <string name="madeBy">Made by Deniz :)</string>
 
     <string name="openInfo">Open info panel on startup</string>
-    <string name="openInfoTwo">Opens automatically without user input</string>
+    <string name="openInfoNoUserInput">Opens automatically without user input</string>
     <string name="autoRefresh">Refresh on startup</string>
-    <string name="autoRefreshTwo">In case the background sync doesn\'t work</string>
+    <string name="ifSyncNotWorking">In case the background sync doesn\'t work</string>
 
-    <string name="helpClassesTitle">How to enter your grade</string>
-    <string name="helpClasses">Enter your current grade to have it appear in your personal plan and be notified about any information.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nMultiple grades can only be entered when no courses have been entered.</string>
-    <string name="helpCoursesTitle">How to enter your courses</string>
-    <string name="helpCourses">You need to enter the course abbreviation for every course you want in your personal plan and want to be notified about. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.</string>
-    <string name="donttell">Don\'t tell him :0</string>
-    <string name="experimentalmenu">Experimental Menu</string>
-    <string name="diagnosticsmenu">Diagnostics Menu</string>
-    <string name="fortest">This menu is currently intended for testing only. Additional features may be added in the future. Feel free to try arbitrary codes.</string>
-    <string name="positivebutton">Apply</string>
-    <string name="nothinghappened">Invalid code</string>
-    <string name="calculate">Calculate</string>
-    <string name="boy">Boy</string>
-    <string name="girl">Girl</string>
-    <string name="dating">Q1 Matchmaker</string>
-    <string name="error">An error occurred!</string>
-    <string name="nosubst">No substitutions for you</string>
+    <string name="enterGradeHelpTitle">How to enter your grade</string>
+    <string name="enterGradeHelp">Enter your current grade to have it appear in your personal plan and be notified about any information.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nMultiple grades can only be entered when no courses have been entered.</string>
+    <string name="enterCoursesHelpTitle">How to enter your courses</string>
+    <string name="enterCoursesHelp">You need to enter the course abbreviation for every course you want in your personal plan and want to be notified about. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.</string>
+    <string name="dontTellHim">Don\'t tell him :0</string>
+    <string name="experimentalMenu">Experimental Menu</string>
+    <string name="diagnosticsMenu">Diagnostics Menu</string>
+    <string name="menuForTests">This menu is currently intended for testing only. Additional features may be added in the future. Feel free to try arbitrary codes.</string>
+    <string name="apply">Apply</string>
+    <string name="invalidCode">Invalid code</string>
+    <string name="noSubstitutionsForYou">No substitutions for you</string>
 
-    <string name="chinaTitle">Information regarding your device</string>
-    <string name="chinaDialog">Some Chinese manufacturers, such as Huawei/Honor and Xiaomi, heavily suppress background services, which results in notifications and background synchronisation not working.\n\nFrom my current research, I have determined that there\'s no easy workaround I can implement.\n\nYou can, however, try to disable power optimisation for this app in the settings:\n\nClose the app and open \"Settings\" -> \"Apps\" -> \"AvH Plan\" -> \"Battery\" -> \"Launch\" -> disable \"Manage automatically\", enable \"Run in background\"\n\nThis is not guaranteed to work.</string>
+    <string name="chineseDevicesTitle">Information regarding your device</string>
+    <string name="chineseDevicesHelp">Some Chinese manufacturers, such as Huawei/Honor and Xiaomi, heavily suppress background services, which results in notifications and background synchronisation not working.\n\nFrom my current research, I have determined that there\'s no easy workaround I can implement.\n\nYou can, however, try to disable power optimisation for this app in the settings:\n\nClose the app and open \"Settings\" -> \"Apps\" -> \"AvH Plan\" -> \"Battery\" -> \"Launch\" -> disable \"Manage automatically\", enable \"Run in background\"\n\nThis is not guaranteed to work.</string>
 
-    <string name="customisecolor1">Customise colours</string>
-    <string name="customisecolor2">Customise every subject individually</string>
+    <string name="customiseColoursTitle">Customise colours</string>
+    <string name="customiseColoursIndividually">Customise every subject individually</string>
 
     <string name="courseDeu">German (+ as a second language)</string>
     <string name="courseMat">Mathematics</string>
@@ -111,17 +105,13 @@
     <string name="courseFor">Special Education</string>
     <string name="courseWp">WP &amp; "Methodenstunde"</string>
 
-    <string name="clearall">Clear all</string>
-    <string name="allcolourscleared">Colours for all courses have been cleared</string>
-    <string name="chromecompatible">No Chrome-compatible browser found</string>
-    <string name="noyoutube">YouTube app not found</string>
-    <string name="showinfo">Show info tab in navigation bar</string>
-    <string name="swipeindependent">Independent of swipe gesture</string>
-    <string name="lastupdatedK">"Last updated: "</string>
-    <string name="darkmode2">Enables night mode</string>
-    <string name="yourplan">Your Plan</string>
+    <string name="chromeCompatibleNotFound">No Chrome-compatible browser found</string>
+    <string name="youtubeNotFound">YouTube app not found</string>
+    <string name="lastUpdated">"Last updated: "</string>
+    <string name="nightMode">Enables night mode</string>
+    <string name="yourPlan">Your Plan</string>
 
-    <string-array name="greetings_morning">
+    <string-array name="greetingsMorning">
         <item>Good morning, %s!</item>
         <item>Have a nice day, %s.</item>
         <item>How are you, %s?</item>
@@ -131,9 +121,9 @@
         <item>Nice to see you, %s.</item>
         <item>How\'ve you been, %s?</item>
     </string-array>
-    <string-array name="greetings_noon">
+    <string-array name="greetingsNoon">
         <item>Good day, %s!</item>
-        <item>Hope you\'re having a nice day, %s.</item>
+        <item>Have a nice day, %s.</item>
         <item>How are you, %s?</item>
         <item>Enjoying your day, %s?</item>
         <item>Hey, %s!</item>
@@ -141,7 +131,7 @@
         <item>Nice to see you, %s.</item>
         <item>Enjoy your day, %s!</item>
     </string-array>
-    <string-array name="greetings_evening">
+    <string-array name="greetingsEvening">
         <item>Good evening, %s!</item>
         <item>Enjoy your evening, %s.</item>
         <item>How are you, %s?</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 04f3fc2..ef34521 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <style name="SelectableItemTheme">
-        <item name="colorControlHighlight">@color/accent</item>
+        <item name="colorControlHighlight">@color/colorAccent</item>
     </style>
 
     <style name="SelectableItemBackground">
@@ -10,16 +10,16 @@
     </style>
 
     <style name="AppTheme0" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/accent</item>
-        <item name="colorPrimaryDark">@color/background</item>
-        <item name="colorAccent">@color/accent</item>
+        <item name="colorPrimary">@color/colorAccent</item>
+        <item name="colorPrimaryDark">@color/colorBackground</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:fontFamily">@font/manrope_medium</item>
-        <item name="android:colorEdgeEffect">@color/accent</item>
+        <item name="android:colorEdgeEffect">@color/colorAccent</item>
     </style>
 
     <style name="AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-        <item name="android:background">@color/lightbackground</item>
-        <item name="android:textColorPrimary">@color/textcolor</item>
+        <item name="android:background">@color/colorBackgroundLight</item>
+        <item name="android:textColorPrimary">@color/colorText</item>
     </style>
 
     <style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
@@ -31,9 +31,9 @@
     </style>
 
     <style name="EditTextTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
-        <item name="colorControlNormal">@color/hintcolor</item>
-        <item name="colorControlActivated">@color/accent</item>
-        <item name="colorControlHighlight">@color/accent</item>
+        <item name="colorControlNormal">@color/colorHint</item>
+        <item name="colorControlActivated">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/colorAccent</item>
     </style>
 
     <!-- The launcher theme. It sets the main window background to the launch_screen drawable -->