diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 044aa9a..a51bb42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
 jobs:
   build:
     name: Android Build
diff --git a/README.md b/README.md
index cf49e4e..e099fcb 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,4 @@
-# timetable
+# Timetable
+![Workflow Status](https://github.com/user5522/timetable/actions/workflows/build.yml/badge.svg)
 
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+A Flutter based Android timetable application for managing time.
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d0c1af4..8dbb2ae 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:enableOnBackInvokedCallback="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/lib/components/settings/customize_timetable.dart b/lib/components/settings/customize_timetable.dart
index 0f37f4d..e7c5953 100644
--- a/lib/components/settings/customize_timetable.dart
+++ b/lib/components/settings/customize_timetable.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// All the settings that allow for customizing the timetable.
 class CustomizeTimetableOptions extends ConsumerWidget {
diff --git a/lib/components/settings/screens/timetable_period_screen.dart b/lib/components/settings/screens/timetable_period_screen.dart
index 5579fb0..00a4acd 100644
--- a/lib/components/settings/screens/timetable_period_screen.dart
+++ b/lib/components/settings/screens/timetable_period_screen.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/constants/custom_times.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
-/// 
+/// Screen to manage the period of the timetable.
+/// Changes the start time and end time of the timetable.
 class TimetablePeriodScreen extends ConsumerWidget {
   const TimetablePeriodScreen({super.key});
 
diff --git a/lib/components/settings/timetable_data.dart b/lib/components/settings/timetable_data.dart
index 14e64c4..94ddf59 100644
--- a/lib/components/settings/timetable_data.dart
+++ b/lib/components/settings/timetable_data.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/components/widgets/alert_dialog.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/provider/subjects.dart';
 
 /// All the settings that allow for manipulating the timetable's data.
 class TimetableDataOptions extends ConsumerWidget {
@@ -9,7 +9,7 @@ class TimetableDataOptions extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final subjNotifier = ref.watch(subjectProvider.notifier);
+    final subjNotifier = ref.watch(subjProvider.notifier);
 
     return Column(
       children: [
diff --git a/lib/components/settings/timetable_features.dart b/lib/components/settings/timetable_features.dart
index eaf1428..f929fcf 100644
--- a/lib/components/settings/timetable_features.dart
+++ b/lib/components/settings/timetable_features.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/components/settings/screens/timetable_period_screen.dart';
 
 /// All the settings for changing some timetable features.
@@ -27,18 +27,20 @@ class TimetableFeaturesOptions extends ConsumerWidget {
               ),
             );
           },
-          title: const Text("Time Period Config"),
+          title: const Text("Time Period Configuration"),
         ),
         SwitchListTile(
           title: const Text("Rotation Weeks"),
-          subtitle: const Text("Experimental"),
           value: rotationWeeks,
           onChanged: (bool value) {
             settings.updateRotationWeeks(value);
           },
         ),
         SwitchListTile(
-          title: const Text("AutoComplete Colors"),
+          title: const Text("Auto Complete Colors"),
+          subtitle: const Text(
+            "auto assigns colors from previously made subjects that have matching names",
+          ),
           value: autoCompleteColor,
           onChanged: (bool value) {
             settings.updateAutoCompleteColor(value);
diff --git a/lib/components/subject_management/subject_configs/day_time_week_config.dart b/lib/components/subject_management/subject_configs/day_time_week_config.dart
index e01f221..ecb5531 100644
--- a/lib/components/subject_management/subject_configs/day_time_week_config.dart
+++ b/lib/components/subject_management/subject_configs/day_time_week_config.dart
@@ -6,7 +6,7 @@ import 'package:timetable/components/subject_management/subject_configs/time_con
 import 'package:timetable/components/widgets/list_tile_group.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Day, Time & Rotation Week config part of the Subject creation screen.
 class TimeDayRotationWeekConfig extends ConsumerWidget {
diff --git a/lib/components/subject_management/subject_configs/rotation_week_config.dart b/lib/components/subject_management/subject_configs/rotation_week_config.dart
index 352b34c..825a1f4 100644
--- a/lib/components/subject_management/subject_configs/rotation_week_config.dart
+++ b/lib/components/subject_management/subject_configs/rotation_week_config.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:timetable/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
 
 /// Rotation Week config part of the Subject creation screen.
 class RotationWeekConfig extends StatelessWidget {
@@ -29,12 +30,9 @@ class RotationWeekConfig extends StatelessWidget {
               isDismissible: true,
               context: context,
               builder: (context) {
-                return SizedBox(
-                  height: 200,
-                  child: RotationWeekModalBottomSheet(
-                    rotationWeek: rotationWeek,
-                    rotationWeeks: rotationWeeks,
-                  ),
+                return RotationWeekModalBottomSheet(
+                  rotationWeek: rotationWeek,
+                  rotationWeeks: rotationWeeks,
                 );
               },
             );
diff --git a/lib/components/subject_management/subject_configs/time_config.dart b/lib/components/subject_management/subject_configs/time_config.dart
index fad5678..2f95b75 100644
--- a/lib/components/subject_management/subject_configs/time_config.dart
+++ b/lib/components/subject_management/subject_configs/time_config.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/constants/custom_times.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Time config part of the Subject creation screen.
 class TimeConfig extends ConsumerWidget {
@@ -115,12 +115,11 @@ class TimeConfig extends ConsumerWidget {
             ),
           ),
         ),
-        const SizedBox(
-          width: 10,
-        ),
-        const Icon(Icons.arrow_forward),
-        const SizedBox(
-          width: 10,
+        const Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal: 10,
+          ),
+          child: Icon(Icons.arrow_forward),
         ),
         ActionChip(
           side: BorderSide.none,
@@ -153,15 +152,14 @@ class TimeConfig extends ConsumerWidget {
             ),
           ),
         ),
-        if (occupied == true)
-          const SizedBox(
-            width: 10,
+        if (occupied)
+          const Padding(
+            padding: EdgeInsets.only(left: 10),
+            child: Icon(
+              Icons.cancel,
+              color: Colors.redAccent,
+            ),
           ),
-        if (occupied == true)
-          const Icon(
-            Icons.cancel,
-            color: Colors.redAccent,
-          )
       ],
     );
   }
diff --git a/lib/components/subject_management/subject_screen.dart b/lib/components/subject_management/subject_screen.dart
index 2d00ea7..d12a8dc 100644
--- a/lib/components/subject_management/subject_screen.dart
+++ b/lib/components/subject_management/subject_screen.dart
@@ -8,16 +8,17 @@ import 'package:timetable/components/widgets/list_tile_group.dart';
 import 'package:timetable/constants/basic_subject.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/overlapping_subjects.dart';
-import 'package:timetable/models/settings.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/overlapping_subjects.dart';
+import 'package:timetable/provider/settings.dart';
+import 'package:timetable/provider/subjects.dart';
 
 /// The Subject creation/modification screen.
 /// Uses [TimeDayRotationWeekConfig], [NotesTile] and [ColorsConfig]
 class SubjectScreen extends HookConsumerWidget {
   final int? rowIndex;
   final int? columnIndex;
-  final Subject? subject;
+  final SubjectData? subject;
 
   const SubjectScreen({
     super.key,
@@ -30,7 +31,13 @@ class SubjectScreen extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final subjects = ref.watch(subjProvider);
+    final subjectNotifier = ref.watch(subjProvider.notifier);
+    final overlappingSubjects = ref.watch(overlappingSubjectsProvider);
+    final autoCompleteColor = ref.watch(settingsProvider).autoCompleteColor;
+
     final bool isSubjectNull = subject == null;
+    final int id = isSubjectNull ? subjects.length : subject!.id;
     final startTime = useState(
       TimeOfDay(
         hour: isSubjectNull ? (rowIndex! + 8) : subject!.startTime.hour,
@@ -43,9 +50,7 @@ class SubjectScreen extends HookConsumerWidget {
         minute: 0,
       ),
     );
-    final overlappingSubjects = ref.watch(overlappingSubjectsProvider);
-    final state = ref.read(subjectProvider.notifier);
-    final autoCompleteColor = ref.watch(settingsProvider).autoCompleteColor;
+
     final day = useState(
         Days.values[isSubjectNull ? columnIndex! : subject!.day.index]);
     final rotationWeek =
@@ -56,7 +61,8 @@ class SubjectScreen extends HookConsumerWidget {
     final location = useState(subject?.location ?? "");
     final note = useState(subject?.note ?? "");
 
-    final Subject newSubject = Subject(
+    final SubjectData newSubject = SubjectData(
+      id: id,
       label: label.value,
       location: location.value,
       color: color.value,
@@ -67,8 +73,6 @@ class SubjectScreen extends HookConsumerWidget {
       note: note.value,
     );
 
-    final subjects = ref.watch(subjectProvider);
-
     final subjectsInSameDay = subjects
         .where(
           (e) => e.day == day.value,
@@ -116,7 +120,7 @@ class SubjectScreen extends HookConsumerWidget {
                 foregroundColor: Theme.of(context).colorScheme.errorContainer,
               ),
               onPressed: () {
-                state.removeSubject(subject!, overlappingSubjects);
+                subjectNotifier.deleteSubject(newSubject);
                 ScaffoldMessenger.of(context).showSnackBar(
                   const SnackBar(
                     content: Text('Subject Deleted!'),
@@ -139,8 +143,8 @@ class SubjectScreen extends HookConsumerWidget {
               onPressed: () {
                 if (formKey.currentState!.validate()) {
                   if (isSubjectNull) {
-                    if (isOccupied == false) {
-                      state.addSubject(newSubject);
+                    if (!isOccupied) {
+                      subjectNotifier.addSubject(newSubject.toCompanion(false));
                       Navigator.pop(context, label.value);
                     } else {
                       ScaffoldMessenger.of(context).showSnackBar(
@@ -150,8 +154,8 @@ class SubjectScreen extends HookConsumerWidget {
                       );
                     }
                   } else {
-                    if (isOccupiedExceptSelf == false) {
-                      state.updateSubject(subject!, newSubject);
+                    if (!isOccupiedExceptSelf) {
+                      subjectNotifier.updateSubject(newSubject);
                       Navigator.pop(context, label.value);
                     } else {
                       ScaffoldMessenger.of(context).showSnackBar(
@@ -197,8 +201,8 @@ class SubjectScreen extends HookConsumerWidget {
                             color.value = subjects
                                 .firstWhere(
                                   (subj) =>
-                                      label.value.toLowerCase() ==
-                                      subj.label.toLowerCase(),
+                                      label.value.toLowerCase().trim() ==
+                                      subj.label.toLowerCase().trim(),
                                   orElse: () => basicSubject,
                                 )
                                 .color;
@@ -220,12 +224,9 @@ class SubjectScreen extends HookConsumerWidget {
                     ),
                   ],
                 ),
-                const SizedBox(
-                  height: 10,
-                ),
-                ColorsConfig(color: color),
-                const SizedBox(
-                  height: 10,
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 10),
+                  child: ColorsConfig(color: color),
                 ),
                 TimeDayRotationWeekConfig(
                   day: day,
@@ -234,12 +235,12 @@ class SubjectScreen extends HookConsumerWidget {
                   endTime: endTime,
                   occupied: isSubjectNull ? isOccupied : isOccupiedExceptSelf,
                 ),
-                const SizedBox(
-                  height: 10,
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 10),
+                  child: NotesTile(
+                    note: note,
+                  ),
                 ),
-                NotesTile(
-                  note: note,
-                )
               ],
             ),
           ),
diff --git a/lib/components/timetable_views/day_view.dart b/lib/components/timetable_views/day_view.dart
index e616fd3..9f7fcb7 100644
--- a/lib/components/timetable_views/day_view.dart
+++ b/lib/components/timetable_views/day_view.dart
@@ -5,21 +5,23 @@ import 'package:timetable/components/widgets/day_view_subject_builder.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/grid_properties.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
 
 /// Timetable view that shows each day's subjects in a single screen.
 class TimetableDayView extends HookConsumerWidget {
   final ValueNotifier<RotationWeeks> rotationWeek;
+  final List<SubjectData> subject;
 
   const TimetableDayView({
     super.key,
     required this.rotationWeek,
+    required this.subject,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     PageController controller;
-    final subject = ref.watch(subjectProvider);
     controller = PageController(initialPage: DateTime.now().weekday - 1);
 
     return Column(
@@ -51,7 +53,10 @@ class TimetableDayView extends HookConsumerWidget {
                       ),
                       Column(
                         crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: getFilteredSubjects(rotationWeek, subject)
+                        children: getFilteredByRotationWeeksSubjects(
+                          rotationWeek,
+                          subject,
+                        )
                             .where((s) => s.day.index == index)
                             .map(
                               (subject) => DayViewSubjectBuilder(
diff --git a/lib/components/timetable_views/grid_view.dart b/lib/components/timetable_views/grid_view.dart
index a1ea142..3ef9bbd 100644
--- a/lib/components/timetable_views/grid_view.dart
+++ b/lib/components/timetable_views/grid_view.dart
@@ -6,26 +6,29 @@ import 'package:timetable/components/widgets/grid_view_overlapping_subjects_buil
 import 'package:timetable/components/widgets/time_column.dart';
 import 'package:timetable/constants/custom_times.dart';
 import 'package:timetable/constants/grid_properties.dart';
+import 'package:timetable/helpers/overlapping_subjects.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/overlapping_subjects.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/overlapping_subjects.dart';
 import 'package:timetable/components/widgets/grid_view_subject_builder.dart';
 import 'package:timetable/components/widgets/subject_container_builder.dart';
 import 'package:timetable/components/widgets/tile.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Timetable view that shows All the days' subjects in a grid form.
 class TimetableGridView extends HookConsumerWidget {
   final ValueNotifier<RotationWeeks> rotationWeek;
+  final List<SubjectData> subject;
 
   const TimetableGridView({
     super.key,
     required this.rotationWeek,
+    required this.subject,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final subject = ref.watch(subjectProvider);
     final compactMode = ref.watch(settingsProvider).compactMode;
     final customStartTime = ref.watch(settingsProvider).customStartTime;
     final customEndTime = ref.watch(settingsProvider).customEndTime;
@@ -60,7 +63,7 @@ class TimetableGridView extends HookConsumerWidget {
                   rows: rows(ref),
                   columns: columns(ref),
                   grid: generate(
-                    getFilteredSubjects(rotationWeek, subject)
+                    getFilteredByRotationWeeksSubjects(rotationWeek, subject)
                         .where(
                           (e) =>
                               e.endTime.hour <=
@@ -83,7 +86,7 @@ class TimetableGridView extends HookConsumerWidget {
   }
 
   List<List<Tile?>> generate(
-    List<Subject> subjects,
+    List<SubjectData> subjects,
     int totalDays,
     int totalHours,
     WidgetRef ref,
@@ -91,6 +94,7 @@ class TimetableGridView extends HookConsumerWidget {
     final overlappingSubjects = ref.watch(overlappingSubjectsProvider);
     final customStartTime = ref.watch(settingsProvider).customStartTime;
 
+    // subjects' containers
     final List<List<Tile?>> grid = List.generate(
       totalDays,
       (columnIndex) => List.generate(
@@ -104,85 +108,63 @@ class TimetableGridView extends HookConsumerWidget {
       ),
     );
 
+    // overlapping subjects
     for (int j = 0; j < subjects.length; j++) {
       for (int i = 0; i < subjects.length; i++) {
         if (i != j) {
-          final bool sameDay = (subjects[i].day.index == subjects[j].day.index);
+          final bool subjectsInSameDay = (subjects[i].day == subjects[j].day);
           final bool subjectsOverlapInTime =
               ((subjects[i].startTime.hour <= subjects[j].startTime.hour &&
                       subjects[i].endTime.hour > subjects[j].startTime.hour) ||
                   (subjects[j].startTime.hour <= subjects[i].startTime.hour &&
                       subjects[j].endTime.hour > subjects[i].startTime.hour));
 
-          if (sameDay && subjectsOverlapInTime) {
+          if (subjectsInSameDay && subjectsOverlapInTime) {
             overlappingSubjects.add([subjects[i], subjects[j]]);
           }
-
-          if (overlappingSubjects.isNotEmpty &&
-              overlappingSubjects.any((e) => e.length == 2)) {
-            overlappingSubjects.removeWhere(
-              (elem) => elem.any(
-                (e) {
-                  if (rotationWeek.value == RotationWeeks.a) {
-                    return e.rotationWeek == RotationWeeks.b;
-                  } else if (rotationWeek.value == RotationWeeks.b) {
-                    return e.rotationWeek == RotationWeeks.a;
-                  } else {
-                    return false;
-                  }
-                },
-              ),
-            );
-
-            for (final subjects in overlappingSubjects) {
-              Subject getSubjectWithEarlierStartTime() {
-                if (subjects[0].startTime.hour < subjects[1].startTime.hour) {
-                  return subjects[0];
-                } else {
-                  return subjects[1];
-                }
-              }
-
-              Subject getSubjectWithLaterEndTime() {
-                if (subjects[0].endTime.hour > subjects[1].endTime.hour) {
-                  return subjects[0];
-                } else {
-                  return subjects[1];
-                }
-              }
-
-              var day = subjects[0].day.index;
-              var earlierStartTimeHour =
-                  getSubjectWithEarlierStartTime().startTime.hour;
-              var laterEndTimeHour = getSubjectWithLaterEndTime().endTime.hour;
-              var start = getSubjectWithEarlierStartTime().startTime.hour -
-                  getCustomStartTime(customStartTime, ref).hour;
-              var end = getSubjectWithLaterEndTime().endTime.hour -
-                  getCustomStartTime(customStartTime, ref).hour;
-              var column = grid[day];
-
-              column.replaceRange(
-                start,
-                end,
-                List.generate(end - start, (_) => null),
-              );
-
-              column[start] = Tile(
-                height: end - start,
-                child: OverlappingSubjBuilder(
-                  subjects: subjects,
-                  earlierStartTimeHour: earlierStartTimeHour,
-                  lateerEndTimeHour: laterEndTimeHour,
-                ),
-              );
-            }
-          }
         }
       }
     }
 
-    for (final subject in subjects.where(
-      (e) => !overlappingSubjects.any((elem) => elem.contains(e)),
+    if (overlappingSubjects.isNotEmpty &&
+        overlappingSubjects.any((e) => e.length == 2)) {
+      getFilteredByRotationWeeksOverlappingSubjects(
+        overlappingSubjects,
+        rotationWeek,
+      );
+    }
+
+    for (final subjects in overlappingSubjects) {
+      var day = subjects[0].day.index;
+      var earlierStartTimeHour = getEarliestSubject(subjects).startTime.hour;
+      var laterEndTimeHour = getLatestSubject(subjects).endTime.hour;
+
+      var startTime = getEarliestSubject(subjects).startTime.hour -
+          getCustomStartTime(customStartTime, ref).hour;
+      var endTime = getLatestSubject(subjects).endTime.hour -
+          getCustomStartTime(customStartTime, ref).hour;
+      var column = grid[day];
+
+      column.replaceRange(
+        startTime,
+        endTime,
+        List.generate(endTime - startTime, (_) => null),
+      );
+
+      column[startTime] = Tile(
+        height: endTime - startTime,
+        child: OverlappingSubjBuilder(
+          subjects: subjects,
+          earlierStartTimeHour: earlierStartTimeHour,
+          laterEndTimeHour: laterEndTimeHour,
+        ),
+      );
+    }
+
+    // normal subjects
+    for (final subject in filterOverlappingSubjects(
+      subjects,
+      overlappingSubjects,
     )) {
       var day = subject.day.index;
       var start = subject.startTime.hour -
diff --git a/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart b/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart
index 19cd73d..baeed99 100644
--- a/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart
+++ b/lib/components/widgets/bottom_sheets/rotation_week_modal_bottom_sheet.dart
@@ -1,13 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
 
 /// Bottom Sheet Modal Widget used to select a subject's rotation week.
 class RotationWeekModalBottomSheet extends StatelessWidget {
   final List<RotationWeeks> rotationWeeks;
   final ValueNotifier<RotationWeeks> rotationWeek;
 
-  const RotationWeekModalBottomSheet(
-      {super.key, required this.rotationWeeks, required this.rotationWeek});
+  const RotationWeekModalBottomSheet({
+    super.key,
+    required this.rotationWeeks,
+    required this.rotationWeek,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/components/widgets/day_view_navigation_bar.dart b/lib/components/widgets/day_view_navigation_bar.dart
index 508b6e6..08d8e1c 100644
--- a/lib/components/widgets/day_view_navigation_bar.dart
+++ b/lib/components/widgets/day_view_navigation_bar.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/constants/days.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Top navigation bar in the day view that allows to switch between days quickly.
 class DayViewNavigationBar extends ConsumerWidget {
diff --git a/lib/components/widgets/day_view_subject_builder.dart b/lib/components/widgets/day_view_subject_builder.dart
index 5e5b89a..edfa884 100644
--- a/lib/components/widgets/day_view_subject_builder.dart
+++ b/lib/components/widgets/day_view_subject_builder.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/settings.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/components/subject_management/subject_screen.dart';
 
 /// Subject builder for the day view.
 class DayViewSubjectBuilder extends ConsumerWidget {
-  final Subject subject;
+  final SubjectData subject;
 
   const DayViewSubjectBuilder({super.key, required this.subject});
 
@@ -76,6 +76,7 @@ class DayViewSubjectBuilder extends ConsumerWidget {
                           ),
                         ),
                       ),
+                      // SizedBox is for incase the label is too long
                       const SizedBox(
                         width: 20,
                       ),
@@ -123,9 +124,6 @@ class DayViewSubjectBuilder extends ConsumerWidget {
                           size: 19,
                           color: subLabelsColor,
                         ),
-                        const SizedBox(
-                          width: 10,
-                        ),
                         Expanded(
                           child: Text(
                             location.toString(),
@@ -143,13 +141,13 @@ class DayViewSubjectBuilder extends ConsumerWidget {
                   if (note != null && note.isNotEmpty)
                     Row(
                       children: [
-                        Icon(
-                          Icons.sticky_note_2_outlined,
-                          size: 19,
-                          color: subLabelsColor,
-                        ),
-                        const SizedBox(
-                          width: 10,
+                        Padding(
+                          padding: const EdgeInsets.only(right: 10),
+                          child: Icon(
+                            Icons.sticky_note_2_outlined,
+                            size: 19,
+                            color: subLabelsColor,
+                          ),
                         ),
                         Expanded(
                           child: Text(
diff --git a/lib/components/widgets/days_row.dart b/lib/components/widgets/days_row.dart
index b3267c4..54e11c4 100644
--- a/lib/components/widgets/days_row.dart
+++ b/lib/components/widgets/days_row.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/grid_properties.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Widget that appears at the top of the timetable grid view screen and shows the week's days.
 class DaysRow extends ConsumerWidget {
@@ -29,7 +29,6 @@ class DaysRow extends ConsumerWidget {
         hideSunday ? days.length - 1 : days.length,
         (i) => Container(
           alignment: Alignment.bottomCenter,
-          height: 20,
           width: tileWidth,
           child: Text(
             singleLetterDays
diff --git a/lib/components/widgets/grid_day_views_toggle.dart b/lib/components/widgets/grid_day_views_toggle.dart
new file mode 100644
index 0000000..dbd7f10
--- /dev/null
+++ b/lib/components/widgets/grid_day_views_toggle.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+/// Toggle between day and grid/week views.
+class GridDayViewsToggle extends HookWidget {
+  final ValueNotifier<bool> isGridView;
+  const GridDayViewsToggle({
+    Key? key,
+    required this.isGridView,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+      onPressed: () {
+        isGridView.value = !isGridView.value;
+      },
+      selectedIcon: const Icon(Icons.view_agenda_outlined),
+      icon: const Icon(Icons.grid_view_outlined),
+      isSelected: isGridView.value,
+    );
+  }
+}
diff --git a/lib/components/widgets/grid_view_overlapping_subjects_builder.dart b/lib/components/widgets/grid_view_overlapping_subjects_builder.dart
index afc8a87..2751355 100644
--- a/lib/components/widgets/grid_view_overlapping_subjects_builder.dart
+++ b/lib/components/widgets/grid_view_overlapping_subjects_builder.dart
@@ -3,22 +3,22 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:non_uniform_border/non_uniform_border.dart';
 import 'package:timetable/constants/custom_times.dart';
 import 'package:timetable/constants/grid_properties.dart';
-import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/settings.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/components/subject_management/subject_screen.dart';
 
 /// Overlapping Subjects Builder for the grid view.
 class OverlappingSubjBuilder extends ConsumerWidget {
-  final List<Subject> subjects;
+  final List<SubjectData> subjects;
   final int earlierStartTimeHour;
-  final int lateerEndTimeHour;
+  final int laterEndTimeHour;
 
   const OverlappingSubjBuilder({
     Key? key,
     required this.subjects,
     required this.earlierStartTimeHour,
-    required this.lateerEndTimeHour,
+    required this.laterEndTimeHour,
   }) : super(key: key);
 
   @override
@@ -50,9 +50,7 @@ class OverlappingSubjBuilder extends ConsumerWidget {
               ? 0
               : 1,
       bottomWidth:
-          lateerEndTimeHour == getCustomEndTime(customEndTime, ref).hour
-              ? 0
-              : 1,
+          laterEndTimeHour == getCustomEndTime(customEndTime, ref).hour ? 0 : 1,
       strokeAlign: BorderSide.strokeAlignCenter,
       color: Colors.grey,
     );
@@ -89,7 +87,12 @@ class OverlappingSubjBuilder extends ConsumerWidget {
                 height: (startTimeHour - earlierStartTimeHour) * (tileHeight),
               ),
               Padding(
-                padding: const EdgeInsets.all(outerPadding),
+                padding: const EdgeInsets.fromLTRB(
+                  outerPadding,
+                  outerPadding,
+                  outerPadding,
+                  outerPadding - 1,
+                ),
                 child: InkWell(
                   onTap: () {
                     Navigator.push(
@@ -118,7 +121,7 @@ class OverlappingSubjBuilder extends ConsumerWidget {
                         width: 0,
                       ),
                     ),
-                    width: ((tileWidth / 2) - .75) - (outerPadding * 2),
+                    width: ((tileWidth / 2) - .75) - (outerPadding * 2.25),
                     height:
                         (((endTimeHour - startTimeHour) * (tileHeight)) - 1) -
                             (outerPadding * 2),
diff --git a/lib/components/widgets/grid_view_subject_builder.dart b/lib/components/widgets/grid_view_subject_builder.dart
index 9043e94..0b25749 100644
--- a/lib/components/widgets/grid_view_subject_builder.dart
+++ b/lib/components/widgets/grid_view_subject_builder.dart
@@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:non_uniform_border/non_uniform_border.dart';
 import 'package:timetable/constants/custom_times.dart';
-import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/settings.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/components/subject_management/subject_screen.dart';
 import 'package:timetable/constants/grid_properties.dart';
 
 /// Subject builder for the grid view.
 class SubjectBuilder extends ConsumerWidget {
-  final Subject subject;
+  final SubjectData subject;
 
   const SubjectBuilder({
     super.key,
@@ -74,7 +74,7 @@ class SubjectBuilder extends ConsumerWidget {
           },
           borderRadius: BorderRadius.circular(5),
           child: Ink(
-            padding: const EdgeInsets.all(5),
+            padding: const EdgeInsets.all(3),
             decoration: BoxDecoration(
               color: color,
               border: Border.all(
@@ -106,7 +106,7 @@ class SubjectBuilder extends ConsumerWidget {
                   height: 5,
                 ),
                 if ((location != null))
-                  if (hideLocation == false)
+                  if (!hideLocation)
                     if (!hideTransparentSubjects)
                       Text(
                         location.toString(),
diff --git a/lib/components/widgets/list_tile_group.dart b/lib/components/widgets/list_tile_group.dart
index 10396da..f2bed89 100644
--- a/lib/components/widgets/list_tile_group.dart
+++ b/lib/components/widgets/list_tile_group.dart
@@ -80,18 +80,18 @@ class ListItem extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        ListTile(
-          title: title,
-          subtitle: subtitle,
-          leading: leading,
-          onTap: () {
-            onTap;
-          },
-          shape: shape,
-          tileColor: Theme.of(context).colorScheme.surfaceVariant,
-        ),
-        const SizedBox(
-          height: 2,
+        Padding(
+          padding: const EdgeInsets.only(bottom: 2),
+          child: ListTile(
+            title: title,
+            subtitle: subtitle,
+            leading: leading,
+            onTap: () {
+              onTap;
+            },
+            shape: shape,
+            tileColor: Theme.of(context).colorScheme.surfaceVariant,
+          ),
         ),
       ],
     );
diff --git a/lib/components/widgets/navigation_bar.dart b/lib/components/widgets/navigation_bar.dart
index 55171ce..7bc716c 100644
--- a/lib/components/widgets/navigation_bar.dart
+++ b/lib/components/widgets/navigation_bar.dart
@@ -1,31 +1,34 @@
 import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/screens/settings_screen.dart';
 import 'package:timetable/screens/timetable_screen.dart';
 
 /// The navigation bar.
-class Navigation extends ConsumerStatefulWidget {
-  const Navigation({super.key});
+class Navigation extends HookConsumerWidget {
+  const Navigation({
+    super.key,
+  });
 
   @override
-  ConsumerState<Navigation> createState() => _NavigationState();
-}
-
-class _NavigationState extends ConsumerState<Navigation> {
-  int currentPageIndex = 0;
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final navbarToggle = ref.watch(settingsProvider).navbarVisible;
+    final currentPageIndex = useState(0);
+
+    void onTabTapped(int index) {
+      if (currentPageIndex.value != index) {
+        currentPageIndex.value = index;
+      }
+    }
 
     return Scaffold(
       bottomNavigationBar: Visibility(
         visible: navbarToggle,
         child: NavigationBar(
-          onDestinationSelected: _onTabTapped,
-          selectedIndex: currentPageIndex,
+          onDestinationSelected: onTabTapped,
+          selectedIndex: currentPageIndex.value,
           destinations: const <Widget>[
             NavigationDestination(
               selectedIcon: Icon(Icons.table_chart),
@@ -49,19 +52,11 @@ class _NavigationState extends ConsumerState<Navigation> {
               transitionType: SharedAxisTransitionType.horizontal,
               child: child);
         },
-        child: _buildPage(currentPageIndex),
+        child: _buildPage(currentPageIndex.value),
       ),
     );
   }
 
-  void _onTabTapped(int index) {
-    if (currentPageIndex != index) {
-      setState(() {
-        currentPageIndex = index;
-      });
-    }
-  }
-
   Widget _buildPage(int pageIndex) {
     switch (pageIndex) {
       case 0:
diff --git a/lib/components/widgets/navigation_bar_toggle.dart b/lib/components/widgets/navigation_bar_toggle.dart
new file mode 100644
index 0000000..ee11343
--- /dev/null
+++ b/lib/components/widgets/navigation_bar_toggle.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:timetable/provider/settings.dart';
+
+/// Toggles the navbar.
+class NavbarToggle extends HookConsumerWidget {
+  const NavbarToggle({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final settings = ref.read(settingsProvider.notifier);
+    final navbarToggle = ref.watch(settingsProvider).navbarVisible;
+
+    return IconButton(
+      onPressed: () {
+        settings.updateNavbarVisible(!navbarToggle);
+      },
+      selectedIcon: const Icon(
+        Icons.fullscreen,
+        size: 25,
+      ),
+      icon: const Icon(
+        Icons.close_fullscreen_outlined,
+        size: 20,
+      ),
+      isSelected: navbarToggle,
+    );
+  }
+}
diff --git a/lib/components/widgets/rotation_week_toggle.dart b/lib/components/widgets/rotation_week_toggle.dart
new file mode 100644
index 0000000..e6ae0f4
--- /dev/null
+++ b/lib/components/widgets/rotation_week_toggle.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/helpers/rotation_weeks.dart';
+
+/// Toggles between all rotation weeks.
+class RotationWeekToggle extends HookWidget {
+  final ValueNotifier<RotationWeeks> rotationWeek;
+  const RotationWeekToggle({
+    Key? key,
+    required this.rotationWeek,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final clickCount = useState(0);
+    List<RotationWeeks> labels = [
+      RotationWeeks.all,
+      RotationWeeks.a,
+      RotationWeeks.b,
+    ];
+
+    void changeLabel() {
+      clickCount.value++;
+      if (clickCount.value >= labels.length) {
+        clickCount.value = 0;
+      }
+    }
+
+    return InkWell(
+      onTap: () {
+        changeLabel();
+        rotationWeek.value = labels[clickCount.value];
+      },
+      borderRadius: BorderRadius.circular(50),
+      child: Ink(
+        width: 40,
+        height: 40,
+        child: Center(
+          child: Text(
+            getRotationWeekButtonLabel(labels[clickCount.value]),
+            style: const TextStyle(
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/components/widgets/time_column.dart b/lib/components/widgets/time_column.dart
index 53af2e7..bdd88ed 100644
--- a/lib/components/widgets/time_column.dart
+++ b/lib/components/widgets/time_column.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/constants/grid_properties.dart';
 import 'package:timetable/constants/time.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Widget that appears at the left side of the timetable grid view screen and shows the timetable time period.
 class TimeColumn extends ConsumerWidget {
@@ -17,30 +17,19 @@ class TimeColumn extends ConsumerWidget {
 
     return Column(children: [
       Column(
-        children: List.generate(
-          rows(ref),
-          (i) => SizedBox(
+        children: List.generate(rows(ref), (i) {
+          return SizedBox(
             height: compactMode ? 125 : 100,
-            width: timeColumnWidth,
             child: Text(
               is24HoursFormat
-                  ? times24h[i +
-                      (customStartTime.hour == 0
-                          ? 0
-                          : customTimePeriod
-                              ? customStartTime.hour
-                              : 8)]
-                  : timespmam[i +
-                      (customStartTime.hour == 0
-                          ? 0
-                          : customTimePeriod
-                              ? customStartTime.hour
-                              : 8)],
+                  ? times24h[i + (customTimePeriod ? customStartTime.hour : 8)]
+                  : timespmam[
+                      i + (customTimePeriod ? customStartTime.hour : 8)],
               style: const TextStyle(fontSize: 13),
               textAlign: TextAlign.center,
             ),
-          ),
-        ),
+          );
+        }),
       ),
     ]);
   }
diff --git a/lib/constants/basic_subject.dart b/lib/constants/basic_subject.dart
index 22b805c..e89d9f8 100644
--- a/lib/constants/basic_subject.dart
+++ b/lib/constants/basic_subject.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/db/database.dart';
 
 /// A basic subject with no additional information.
 /// Used for the color autocomplete feature.
-const basicSubject = Subject(
+const basicSubject = SubjectData(
+  id: 0,
   label: " ",
   location: "",
   color: Colors.black,
diff --git a/lib/constants/custom_times.dart b/lib/constants/custom_times.dart
index 7b53417..33f2ed4 100644
--- a/lib/constants/custom_times.dart
+++ b/lib/constants/custom_times.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Returns the custom start time set by the user if customTimePeriod is true,
 /// otherwise returns the default start time. (8:00)
@@ -8,11 +8,8 @@ TimeOfDay getCustomStartTime(TimeOfDay customTime, WidgetRef ref) {
   final customTimePeriod = ref.watch(settingsProvider).customTimePeriod;
 
   if (customTimePeriod) {
-    if (customTime.hour != 00) {
-      return TimeOfDay(hour: customTime.hour, minute: customTime.minute);
-    } else {
-      return const TimeOfDay(hour: 0, minute: 0);
-    }
+    if (customTime.hour != 0) return customTime;
+    return const TimeOfDay(hour: 0, minute: 0);
   } else {
     return const TimeOfDay(hour: 8, minute: 0);
   }
@@ -24,30 +21,21 @@ TimeOfDay getCustomEndTime(TimeOfDay customTime, WidgetRef ref) {
   final customTimePeriod = ref.watch(settingsProvider).customTimePeriod;
 
   if (customTimePeriod) {
-    if (customTime.hour != 00) {
-      return TimeOfDay(hour: customTime.hour, minute: customTime.minute);
-    } else {
-      return const TimeOfDay(hour: 24, minute: 0);
-    }
+    if (customTime.hour != 0) return customTime;
+    return const TimeOfDay(hour: 24, minute: 0);
   } else {
     return const TimeOfDay(hour: 18, minute: 0);
   }
 }
 
-/// Returns the hour part of the customTime, formatted.
+/// Returns a formatted custom time hour.
 String getCustomTimeHour(TimeOfDay customTime) {
-  if (customTime.hour < 10) {
-    return "0${customTime.hour}";
-  } else {
-    return "${customTime.hour}";
-  }
+  if (customTime.hour < 10) return "0${customTime.hour}";
+  return "${customTime.hour}";
 }
 
-/// Returns the minute part of the customTime, formatted.
+/// Returns a formatted custom time hour.
 String getCustomTimeMinute(TimeOfDay customTime) {
-  if (customTime.minute < 10) {
-    return "0${customTime.minute}";
-  } else {
-    return "${customTime.minute}";
-  }
+  if (customTime.minute < 10) return "0${customTime.minute}";
+  return "${customTime.minute}";
 }
diff --git a/lib/constants/grid_properties.dart b/lib/constants/grid_properties.dart
index 7d0d87e..7d5c777 100644
--- a/lib/constants/grid_properties.dart
+++ b/lib/constants/grid_properties.dart
@@ -1,5 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
 
 /// Width of the time column.
 const double timeColumnWidth = 22.5;
@@ -17,6 +17,7 @@ int columns(WidgetRef ref) {
 
 /// Number of rows in the grid view based on the custom start time and custom end time (if customTimePeriod is true),
 /// otherwise uses the default time period. (8:00 -> 18:00)
+/// if hour difference is 0, there will be 24 rows
 int rows(WidgetRef ref) {
   final customTimePeriod = ref.watch(settingsProvider).customTimePeriod;
   final customStartTime = ref.watch(settingsProvider).customStartTime;
diff --git a/lib/constants/rotation_weeks.dart b/lib/constants/rotation_weeks.dart
index 9c0889c..3aa40a0 100644
--- a/lib/constants/rotation_weeks.dart
+++ b/lib/constants/rotation_weeks.dart
@@ -1,6 +1,3 @@
-import 'package:flutter/material.dart';
-import 'package:timetable/models/subjects.dart';
-
 /// Basic Rotation Weeks.
 enum RotationWeeks {
   all,
@@ -8,86 +5,3 @@ enum RotationWeeks {
   a,
   b,
 }
-
-/// Rotation Weeks button label. (used in the rotation week modal bottom sheet)
-String getRotationWeekLabel(RotationWeeks rotationWeek) {
-  switch (rotationWeek) {
-    case RotationWeeks.none:
-      return "All Weeks";
-    case RotationWeeks.a:
-      return "Week A";
-    case RotationWeeks.b:
-      return "Week B";
-    default:
-      return "All Weeks";
-  }
-}
-
-/// Rotation Weeks action button label. (used in the rotation week selection action button)
-String getRotationWeekButtonLabel(RotationWeeks rotationWeek) {
-  switch (rotationWeek) {
-    case RotationWeeks.none:
-      return "All";
-    case RotationWeeks.a:
-      return "A";
-    case RotationWeeks.b:
-      return "B";
-    default:
-      return "All";
-  }
-}
-
-/// Filters the list of subjects based on the selected rotation week.
-List<Subject> getFilteredSubjects(
-    ValueNotifier<RotationWeeks> rotationWeek, List<Subject> allSubjects) {
-  switch (rotationWeek.value) {
-    case RotationWeeks.all:
-      return allSubjects
-          .where(
-            (s) =>
-                s.rotationWeek == RotationWeeks.none ||
-                s.rotationWeek == RotationWeeks.a ||
-                s.rotationWeek == RotationWeeks.b,
-          )
-          .toList();
-    case RotationWeeks.a:
-      return allSubjects
-          .where(
-            (s) =>
-                s.rotationWeek == RotationWeeks.none ||
-                s.rotationWeek == RotationWeeks.a,
-          )
-          .toList();
-    case RotationWeeks.b:
-      return allSubjects
-          .where(
-            (s) =>
-                s.rotationWeek == RotationWeeks.none ||
-                s.rotationWeek == RotationWeeks.b,
-          )
-          .toList();
-    default:
-      return allSubjects
-          .where(
-            (s) =>
-                s.rotationWeek == RotationWeeks.none ||
-                s.rotationWeek == RotationWeeks.a ||
-                s.rotationWeek == RotationWeeks.b,
-          )
-          .toList();
-  }
-}
-
-/// Returns rotation week label of a Subject.
-String getSubjectRotationWeekLabel(Subject subject) {
-  switch (subject.rotationWeek) {
-    case RotationWeeks.a:
-      return "A";
-    case RotationWeeks.b:
-      return "B";
-    case RotationWeeks.none:
-      return "";
-    default:
-      return "";
-  }
-}
diff --git a/lib/db/connection/native.dart b/lib/db/connection/native.dart
new file mode 100644
index 0000000..018a561
--- /dev/null
+++ b/lib/db/connection/native.dart
@@ -0,0 +1,24 @@
+import 'dart:io';
+
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as p;
+import 'package:sqlite3/sqlite3.dart';
+import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart';
+
+LazyDatabase openConnection() {
+  return LazyDatabase(() async {
+    final dbFolder = await getApplicationDocumentsDirectory();
+    final file = File(p.join(dbFolder.path, 'db.sqlite'));
+
+    if (Platform.isAndroid) {
+      await applyWorkaroundToOpenSqlite3OnOldAndroidVersions();
+    }
+
+    final cachebase = (await getTemporaryDirectory()).path;
+    sqlite3.tempDirectory = cachebase;
+
+    return NativeDatabase.createInBackground(file);
+  });
+}
diff --git a/lib/db/converters/color_converter.dart b/lib/db/converters/color_converter.dart
new file mode 100644
index 0000000..2604ab1
--- /dev/null
+++ b/lib/db/converters/color_converter.dart
@@ -0,0 +1,18 @@
+import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
+
+class ColorConverter extends TypeConverter<Color, int> {
+  const ColorConverter();
+
+  @override
+  Color fromSql(int fromDb) {
+    // Parse TimeOfDay from String
+    return Color(fromDb);
+  }
+
+  @override
+  int toSql(Color value) {
+    // get Color value (int)
+    return value.value;
+  }
+}
diff --git a/lib/db/converters/time_of_day_converter.dart b/lib/db/converters/time_of_day_converter.dart
new file mode 100644
index 0000000..619e767
--- /dev/null
+++ b/lib/db/converters/time_of_day_converter.dart
@@ -0,0 +1,21 @@
+import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
+
+class TimeOfDayConverter extends TypeConverter<TimeOfDay, String> {
+  const TimeOfDayConverter();
+
+  @override
+  TimeOfDay fromSql(String fromDb) {
+    // Parse TimeOfDay from String
+    return TimeOfDay(
+      hour: int.parse(fromDb.split(':')[0].replaceAll("TimeOfDay(", "")),
+      minute: int.parse(fromDb.split(':')[1].replaceAll(")", "")),
+    );
+  }
+
+  @override
+  String toSql(TimeOfDay value) {
+    // Convert TimeOfDay to String
+    return value.toString();
+  }
+}
diff --git a/lib/db/database.dart b/lib/db/database.dart
new file mode 100644
index 0000000..9beac07
--- /dev/null
+++ b/lib/db/database.dart
@@ -0,0 +1,49 @@
+import 'package:drift/drift.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/constants/days.dart';
+import 'package:timetable/db/converters/color_converter.dart';
+import 'package:timetable/db/models/subject.dart';
+import 'package:timetable/db/connection/native.dart';
+import 'package:timetable/db/converters/time_of_day_converter.dart';
+import 'package:flutter/material.dart' as material;
+
+part 'database.g.dart';
+
+@DriftDatabase(tables: [Subject])
+class AppDatabase extends _$AppDatabase {
+  AppDatabase() : super(openConnection());
+
+  @override
+  int get schemaVersion => 2;
+
+  @override
+  MigrationStrategy get migration {
+    return MigrationStrategy(
+      onCreate: (Migrator m) async {
+        await m.createAll();
+      },
+      onUpgrade: (Migrator m, int from, int to) async {
+        if (from < 2) {
+          // colors changed in v2 so they use the ColorConverter
+          // to maintain the Color type instead of using int in v1.
+          await m.alterTable(
+            TableMigration(
+              subject,
+              columnTransformer: {
+                subject.color: subject.color,
+              },
+            ),
+          );
+        }
+      },
+    );
+  }
+
+  static final StateProvider<AppDatabase> provider = StateProvider((ref) {
+    final database = AppDatabase();
+    ref.onDispose(database.close);
+
+    return database;
+  });
+}
diff --git a/lib/db/database.g.dart b/lib/db/database.g.dart
new file mode 100644
index 0000000..f865935
--- /dev/null
+++ b/lib/db/database.g.dart
@@ -0,0 +1,457 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'database.dart';
+
+// ignore_for_file: type=lint
+class $SubjectTable extends Subject with TableInfo<$SubjectTable, SubjectData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $SubjectTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+      'id', aliasedName, false,
+      hasAutoIncrement: true,
+      type: DriftSqlType.int,
+      requiredDuringInsert: false,
+      defaultConstraints:
+          GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'));
+  static const VerificationMeta _labelMeta = const VerificationMeta('label');
+  @override
+  late final GeneratedColumn<String> label = GeneratedColumn<String>(
+      'label', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  static const VerificationMeta _locationMeta =
+      const VerificationMeta('location');
+  @override
+  late final GeneratedColumn<String> location = GeneratedColumn<String>(
+      'location', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  static const VerificationMeta _noteMeta = const VerificationMeta('note');
+  @override
+  late final GeneratedColumn<String> note = GeneratedColumn<String>(
+      'note', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  static const VerificationMeta _colorMeta = const VerificationMeta('color');
+  @override
+  late final GeneratedColumnWithTypeConverter<material.Color, int> color =
+      GeneratedColumn<int>('color', aliasedName, false,
+              type: DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<material.Color>($SubjectTable.$convertercolor);
+  static const VerificationMeta _rotationWeekMeta =
+      const VerificationMeta('rotationWeek');
+  @override
+  late final GeneratedColumnWithTypeConverter<RotationWeeks, int> rotationWeek =
+      GeneratedColumn<int>('rotation_week', aliasedName, false,
+              type: DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<RotationWeeks>($SubjectTable.$converterrotationWeek);
+  static const VerificationMeta _dayMeta = const VerificationMeta('day');
+  @override
+  late final GeneratedColumnWithTypeConverter<Days, int> day =
+      GeneratedColumn<int>('day', aliasedName, false,
+              type: DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<Days>($SubjectTable.$converterday);
+  static const VerificationMeta _startTimeMeta =
+      const VerificationMeta('startTime');
+  @override
+  late final GeneratedColumnWithTypeConverter<material.TimeOfDay, String>
+      startTime = GeneratedColumn<String>('start_time', aliasedName, false,
+              type: DriftSqlType.string, requiredDuringInsert: true)
+          .withConverter<material.TimeOfDay>($SubjectTable.$converterstartTime);
+  static const VerificationMeta _endTimeMeta =
+      const VerificationMeta('endTime');
+  @override
+  late final GeneratedColumnWithTypeConverter<material.TimeOfDay, String>
+      endTime = GeneratedColumn<String>('end_time', aliasedName, false,
+              type: DriftSqlType.string, requiredDuringInsert: true)
+          .withConverter<material.TimeOfDay>($SubjectTable.$converterendTime);
+  @override
+  List<GeneratedColumn> get $columns =>
+      [id, label, location, note, color, rotationWeek, day, startTime, endTime];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'subject';
+  @override
+  VerificationContext validateIntegrity(Insertable<SubjectData> instance,
+      {bool isInserting = false}) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    }
+    if (data.containsKey('label')) {
+      context.handle(
+          _labelMeta, label.isAcceptableOrUnknown(data['label']!, _labelMeta));
+    } else if (isInserting) {
+      context.missing(_labelMeta);
+    }
+    if (data.containsKey('location')) {
+      context.handle(_locationMeta,
+          location.isAcceptableOrUnknown(data['location']!, _locationMeta));
+    }
+    if (data.containsKey('note')) {
+      context.handle(
+          _noteMeta, note.isAcceptableOrUnknown(data['note']!, _noteMeta));
+    }
+    context.handle(_colorMeta, const VerificationResult.success());
+    context.handle(_rotationWeekMeta, const VerificationResult.success());
+    context.handle(_dayMeta, const VerificationResult.success());
+    context.handle(_startTimeMeta, const VerificationResult.success());
+    context.handle(_endTimeMeta, const VerificationResult.success());
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  SubjectData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SubjectData(
+      id: attachedDatabase.typeMapping
+          .read(DriftSqlType.int, data['${effectivePrefix}id'])!,
+      label: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}label'])!,
+      location: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}location']),
+      note: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}note']),
+      color: $SubjectTable.$convertercolor.fromSql(attachedDatabase.typeMapping
+          .read(DriftSqlType.int, data['${effectivePrefix}color'])!),
+      rotationWeek: $SubjectTable.$converterrotationWeek.fromSql(
+          attachedDatabase.typeMapping.read(
+              DriftSqlType.int, data['${effectivePrefix}rotation_week'])!),
+      day: $SubjectTable.$converterday.fromSql(attachedDatabase.typeMapping
+          .read(DriftSqlType.int, data['${effectivePrefix}day'])!),
+      startTime: $SubjectTable.$converterstartTime.fromSql(attachedDatabase
+          .typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}start_time'])!),
+      endTime: $SubjectTable.$converterendTime.fromSql(attachedDatabase
+          .typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}end_time'])!),
+    );
+  }
+
+  @override
+  $SubjectTable createAlias(String alias) {
+    return $SubjectTable(attachedDatabase, alias);
+  }
+
+  static TypeConverter<material.Color, int> $convertercolor =
+      const ColorConverter();
+  static JsonTypeConverter2<RotationWeeks, int, int> $converterrotationWeek =
+      const EnumIndexConverter<RotationWeeks>(RotationWeeks.values);
+  static JsonTypeConverter2<Days, int, int> $converterday =
+      const EnumIndexConverter<Days>(Days.values);
+  static TypeConverter<material.TimeOfDay, String> $converterstartTime =
+      const TimeOfDayConverter();
+  static TypeConverter<material.TimeOfDay, String> $converterendTime =
+      const TimeOfDayConverter();
+}
+
+class SubjectData extends DataClass implements Insertable<SubjectData> {
+  final int id;
+  final String label;
+  final String? location;
+  final String? note;
+  final material.Color color;
+  final RotationWeeks rotationWeek;
+  final Days day;
+  final material.TimeOfDay startTime;
+  final material.TimeOfDay endTime;
+  const SubjectData(
+      {required this.id,
+      required this.label,
+      this.location,
+      this.note,
+      required this.color,
+      required this.rotationWeek,
+      required this.day,
+      required this.startTime,
+      required this.endTime});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['label'] = Variable<String>(label);
+    if (!nullToAbsent || location != null) {
+      map['location'] = Variable<String>(location);
+    }
+    if (!nullToAbsent || note != null) {
+      map['note'] = Variable<String>(note);
+    }
+    {
+      map['color'] = Variable<int>($SubjectTable.$convertercolor.toSql(color));
+    }
+    {
+      map['rotation_week'] = Variable<int>(
+          $SubjectTable.$converterrotationWeek.toSql(rotationWeek));
+    }
+    {
+      map['day'] = Variable<int>($SubjectTable.$converterday.toSql(day));
+    }
+    {
+      map['start_time'] =
+          Variable<String>($SubjectTable.$converterstartTime.toSql(startTime));
+    }
+    {
+      map['end_time'] =
+          Variable<String>($SubjectTable.$converterendTime.toSql(endTime));
+    }
+    return map;
+  }
+
+  SubjectCompanion toCompanion(bool nullToAbsent) {
+    return SubjectCompanion(
+      id: Value(id),
+      label: Value(label),
+      location: location == null && nullToAbsent
+          ? const Value.absent()
+          : Value(location),
+      note: note == null && nullToAbsent ? const Value.absent() : Value(note),
+      color: Value(color),
+      rotationWeek: Value(rotationWeek),
+      day: Value(day),
+      startTime: Value(startTime),
+      endTime: Value(endTime),
+    );
+  }
+
+  factory SubjectData.fromJson(Map<String, dynamic> json,
+      {ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SubjectData(
+      id: serializer.fromJson<int>(json['id']),
+      label: serializer.fromJson<String>(json['label']),
+      location: serializer.fromJson<String?>(json['location']),
+      note: serializer.fromJson<String?>(json['note']),
+      color: serializer.fromJson<material.Color>(json['color']),
+      rotationWeek: $SubjectTable.$converterrotationWeek
+          .fromJson(serializer.fromJson<int>(json['rotationWeek'])),
+      day: $SubjectTable.$converterday
+          .fromJson(serializer.fromJson<int>(json['day'])),
+      startTime: serializer.fromJson<material.TimeOfDay>(json['startTime']),
+      endTime: serializer.fromJson<material.TimeOfDay>(json['endTime']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'label': serializer.toJson<String>(label),
+      'location': serializer.toJson<String?>(location),
+      'note': serializer.toJson<String?>(note),
+      'color': serializer.toJson<material.Color>(color),
+      'rotationWeek': serializer.toJson<int>(
+          $SubjectTable.$converterrotationWeek.toJson(rotationWeek)),
+      'day': serializer.toJson<int>($SubjectTable.$converterday.toJson(day)),
+      'startTime': serializer.toJson<material.TimeOfDay>(startTime),
+      'endTime': serializer.toJson<material.TimeOfDay>(endTime),
+    };
+  }
+
+  SubjectData copyWith(
+          {int? id,
+          String? label,
+          Value<String?> location = const Value.absent(),
+          Value<String?> note = const Value.absent(),
+          material.Color? color,
+          RotationWeeks? rotationWeek,
+          Days? day,
+          material.TimeOfDay? startTime,
+          material.TimeOfDay? endTime}) =>
+      SubjectData(
+        id: id ?? this.id,
+        label: label ?? this.label,
+        location: location.present ? location.value : this.location,
+        note: note.present ? note.value : this.note,
+        color: color ?? this.color,
+        rotationWeek: rotationWeek ?? this.rotationWeek,
+        day: day ?? this.day,
+        startTime: startTime ?? this.startTime,
+        endTime: endTime ?? this.endTime,
+      );
+  @override
+  String toString() {
+    return (StringBuffer('SubjectData(')
+          ..write('id: $id, ')
+          ..write('label: $label, ')
+          ..write('location: $location, ')
+          ..write('note: $note, ')
+          ..write('color: $color, ')
+          ..write('rotationWeek: $rotationWeek, ')
+          ..write('day: $day, ')
+          ..write('startTime: $startTime, ')
+          ..write('endTime: $endTime')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      id, label, location, note, color, rotationWeek, day, startTime, endTime);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SubjectData &&
+          other.id == this.id &&
+          other.label == this.label &&
+          other.location == this.location &&
+          other.note == this.note &&
+          other.color == this.color &&
+          other.rotationWeek == this.rotationWeek &&
+          other.day == this.day &&
+          other.startTime == this.startTime &&
+          other.endTime == this.endTime);
+}
+
+class SubjectCompanion extends UpdateCompanion<SubjectData> {
+  final Value<int> id;
+  final Value<String> label;
+  final Value<String?> location;
+  final Value<String?> note;
+  final Value<material.Color> color;
+  final Value<RotationWeeks> rotationWeek;
+  final Value<Days> day;
+  final Value<material.TimeOfDay> startTime;
+  final Value<material.TimeOfDay> endTime;
+  const SubjectCompanion({
+    this.id = const Value.absent(),
+    this.label = const Value.absent(),
+    this.location = const Value.absent(),
+    this.note = const Value.absent(),
+    this.color = const Value.absent(),
+    this.rotationWeek = const Value.absent(),
+    this.day = const Value.absent(),
+    this.startTime = const Value.absent(),
+    this.endTime = const Value.absent(),
+  });
+  SubjectCompanion.insert({
+    this.id = const Value.absent(),
+    required String label,
+    this.location = const Value.absent(),
+    this.note = const Value.absent(),
+    required material.Color color,
+    required RotationWeeks rotationWeek,
+    required Days day,
+    required material.TimeOfDay startTime,
+    required material.TimeOfDay endTime,
+  })  : label = Value(label),
+        color = Value(color),
+        rotationWeek = Value(rotationWeek),
+        day = Value(day),
+        startTime = Value(startTime),
+        endTime = Value(endTime);
+  static Insertable<SubjectData> custom({
+    Expression<int>? id,
+    Expression<String>? label,
+    Expression<String>? location,
+    Expression<String>? note,
+    Expression<int>? color,
+    Expression<int>? rotationWeek,
+    Expression<int>? day,
+    Expression<String>? startTime,
+    Expression<String>? endTime,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (label != null) 'label': label,
+      if (location != null) 'location': location,
+      if (note != null) 'note': note,
+      if (color != null) 'color': color,
+      if (rotationWeek != null) 'rotation_week': rotationWeek,
+      if (day != null) 'day': day,
+      if (startTime != null) 'start_time': startTime,
+      if (endTime != null) 'end_time': endTime,
+    });
+  }
+
+  SubjectCompanion copyWith(
+      {Value<int>? id,
+      Value<String>? label,
+      Value<String?>? location,
+      Value<String?>? note,
+      Value<material.Color>? color,
+      Value<RotationWeeks>? rotationWeek,
+      Value<Days>? day,
+      Value<material.TimeOfDay>? startTime,
+      Value<material.TimeOfDay>? endTime}) {
+    return SubjectCompanion(
+      id: id ?? this.id,
+      label: label ?? this.label,
+      location: location ?? this.location,
+      note: note ?? this.note,
+      color: color ?? this.color,
+      rotationWeek: rotationWeek ?? this.rotationWeek,
+      day: day ?? this.day,
+      startTime: startTime ?? this.startTime,
+      endTime: endTime ?? this.endTime,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (label.present) {
+      map['label'] = Variable<String>(label.value);
+    }
+    if (location.present) {
+      map['location'] = Variable<String>(location.value);
+    }
+    if (note.present) {
+      map['note'] = Variable<String>(note.value);
+    }
+    if (color.present) {
+      map['color'] =
+          Variable<int>($SubjectTable.$convertercolor.toSql(color.value));
+    }
+    if (rotationWeek.present) {
+      map['rotation_week'] = Variable<int>(
+          $SubjectTable.$converterrotationWeek.toSql(rotationWeek.value));
+    }
+    if (day.present) {
+      map['day'] = Variable<int>($SubjectTable.$converterday.toSql(day.value));
+    }
+    if (startTime.present) {
+      map['start_time'] = Variable<String>(
+          $SubjectTable.$converterstartTime.toSql(startTime.value));
+    }
+    if (endTime.present) {
+      map['end_time'] = Variable<String>(
+          $SubjectTable.$converterendTime.toSql(endTime.value));
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SubjectCompanion(')
+          ..write('id: $id, ')
+          ..write('label: $label, ')
+          ..write('location: $location, ')
+          ..write('note: $note, ')
+          ..write('color: $color, ')
+          ..write('rotationWeek: $rotationWeek, ')
+          ..write('day: $day, ')
+          ..write('startTime: $startTime, ')
+          ..write('endTime: $endTime')
+          ..write(')'))
+        .toString();
+  }
+}
+
+abstract class _$AppDatabase extends GeneratedDatabase {
+  _$AppDatabase(QueryExecutor e) : super(e);
+  late final $SubjectTable subject = $SubjectTable(this);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [subject];
+}
diff --git a/lib/db/models/settings.dart b/lib/db/models/settings.dart
new file mode 100644
index 0000000..03b72ff
--- /dev/null
+++ b/lib/db/models/settings.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+
+/// Settings data model.
+class Settings {
+  final bool customTimePeriod;
+  final bool compactMode;
+  final bool hideLocation;
+  final bool singleLetterDays;
+  final bool rotationWeeks;
+  final TimeOfDay customStartTime;
+  final TimeOfDay customEndTime;
+  final bool hideSunday;
+  final bool autoCompleteColor;
+  final bool hideTransparentSubject;
+  final bool navbarVisible;
+  final bool monetTheming;
+
+  // settings defaults
+  Settings({
+    this.customTimePeriod = false,
+    this.compactMode = true,
+    this.hideLocation = false,
+    this.singleLetterDays = false,
+    this.rotationWeeks = false,
+    this.customStartTime = const TimeOfDay(hour: 08, minute: 00),
+    this.customEndTime = const TimeOfDay(hour: 18, minute: 00),
+    this.hideSunday = false,
+    this.autoCompleteColor = true,
+    this.hideTransparentSubject = true,
+    this.navbarVisible = true,
+    this.monetTheming = false,
+  });
+
+  Settings copy({
+    bool? customTimePeriod,
+    bool? compactMode,
+    bool? hideLocation,
+    bool? singleLetterDays,
+    bool? rotationWeeks,
+    TimeOfDay? customStartTime,
+    TimeOfDay? customEndTime,
+    bool? hideSunday,
+    bool? autoCompleteColor,
+    bool? hideTransparentSubject,
+    bool? navbarVisible,
+    bool? monetTheming,
+  }) =>
+      Settings(
+        customTimePeriod: customTimePeriod ?? this.customTimePeriod,
+        compactMode: compactMode ?? this.compactMode,
+        hideLocation: hideLocation ?? this.hideLocation,
+        singleLetterDays: singleLetterDays ?? this.singleLetterDays,
+        rotationWeeks: rotationWeeks ?? this.rotationWeeks,
+        customStartTime: customStartTime ?? this.customStartTime,
+        customEndTime: customEndTime ?? this.customEndTime,
+        hideSunday: hideSunday ?? this.hideSunday,
+        autoCompleteColor: autoCompleteColor ?? this.autoCompleteColor,
+        hideTransparentSubject:
+            hideTransparentSubject ?? this.hideTransparentSubject,
+        navbarVisible: navbarVisible ?? this.navbarVisible,
+        monetTheming: monetTheming ?? this.monetTheming,
+      );
+}
diff --git a/lib/db/models/subject.dart b/lib/db/models/subject.dart
new file mode 100644
index 0000000..6bbc546
--- /dev/null
+++ b/lib/db/models/subject.dart
@@ -0,0 +1,19 @@
+import 'package:drift/drift.dart';
+import 'package:timetable/constants/days.dart';
+import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/db/converters/color_converter.dart';
+import 'package:timetable/db/converters/time_of_day_converter.dart';
+
+class Subject extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get label => text()();
+  TextColumn get location => text().nullable()();
+  TextColumn get note => text().nullable()();
+  // changed in v2 so it uses the ColorConverter
+  // to maintain the Color type instead of using int.
+  IntColumn get color => integer().map(const ColorConverter())();
+  IntColumn get rotationWeek => intEnum<RotationWeeks>()();
+  IntColumn get day => intEnum<Days>()();
+  TextColumn get startTime => text().map(const TimeOfDayConverter())();
+  TextColumn get endTime => text().map(const TimeOfDayConverter())();
+}
diff --git a/lib/helpers/overlapping_subjects.dart b/lib/helpers/overlapping_subjects.dart
new file mode 100644
index 0000000..947e9fe
--- /dev/null
+++ b/lib/helpers/overlapping_subjects.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
+
+/// filters overlapping subjects from the list of all subjects.
+List<SubjectData> filterOverlappingSubjects(
+  List<SubjectData> subjects,
+  List<List<SubjectData>> overlappingSubjects,
+) {
+  return subjects
+      .where(
+        (e) => !overlappingSubjects.any((elem) => elem.contains(e)),
+      )
+      .toList();
+}
+
+/// Returns the subject with the earlier starting time.
+SubjectData getEarliestSubject(List<SubjectData> subjects) {
+  SubjectData earliestSubject = subjects.first;
+  for (final subject in subjects) {
+    if (subject.startTime.hour > earliestSubject.startTime.hour) {
+      earliestSubject = subject;
+    }
+  }
+  return earliestSubject;
+}
+
+/// Returns the subject with the later ending time.
+SubjectData getLatestSubject(List<SubjectData> subjects) {
+  SubjectData latestSubject = subjects.first;
+  for (final subject in subjects) {
+    if (subject.endTime.hour > latestSubject.endTime.hour) {
+      latestSubject = subject;
+    }
+  }
+  return latestSubject;
+}
+
+/// filters overlapping subjects by the current rotation week.
+void getFilteredByRotationWeeksOverlappingSubjects(
+  List<List<SubjectData>> overlappingSubjects,
+  ValueNotifier<RotationWeeks> rotationWeek,
+) {
+  return overlappingSubjects.removeWhere(
+    (elem) => elem.any(
+      (e) {
+        if (rotationWeek.value == RotationWeeks.a) {
+          return e.rotationWeek == RotationWeeks.b;
+        } else if (rotationWeek.value == RotationWeeks.b) {
+          return e.rotationWeek == RotationWeeks.a;
+        } else {
+          return false;
+        }
+      },
+    ),
+  );
+}
diff --git a/lib/helpers/rotation_weeks.dart b/lib/helpers/rotation_weeks.dart
new file mode 100644
index 0000000..9a6294e
--- /dev/null
+++ b/lib/helpers/rotation_weeks.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:timetable/constants/rotation_weeks.dart';
+import 'package:timetable/db/database.dart';
+
+/// Rotation Weeks button label. (used in the rotation week modal bottom sheet)
+String getRotationWeekLabel(RotationWeeks rotationWeek) {
+  switch (rotationWeek) {
+    case RotationWeeks.none:
+      return "All Weeks";
+    case RotationWeeks.a:
+      return "Week A";
+    case RotationWeeks.b:
+      return "Week B";
+    default:
+      return "All Weeks";
+  }
+}
+
+/// Rotation Weeks action button label. (used in the rotation week selection action button)
+String getRotationWeekButtonLabel(RotationWeeks rotationWeek) {
+  switch (rotationWeek) {
+    case RotationWeeks.none:
+      return "All";
+    case RotationWeeks.a:
+      return "A";
+    case RotationWeeks.b:
+      return "B";
+    default:
+      return "All";
+  }
+}
+
+/// Filters the list of subjects based on the selected rotation week.
+List<SubjectData> getFilteredByRotationWeeksSubjects(
+  ValueNotifier<RotationWeeks> rotationWeek,
+  List<SubjectData> allSubjects,
+) {
+  switch (rotationWeek.value) {
+    case RotationWeeks.all:
+      return allSubjects
+          .where(
+            (s) =>
+                s.rotationWeek == RotationWeeks.none ||
+                s.rotationWeek == RotationWeeks.a ||
+                s.rotationWeek == RotationWeeks.b,
+          )
+          .toList();
+    case RotationWeeks.a:
+      return allSubjects
+          .where(
+            (s) =>
+                s.rotationWeek == RotationWeeks.none ||
+                s.rotationWeek == RotationWeeks.a,
+          )
+          .toList();
+    case RotationWeeks.b:
+      return allSubjects
+          .where(
+            (s) =>
+                s.rotationWeek == RotationWeeks.none ||
+                s.rotationWeek == RotationWeeks.b,
+          )
+          .toList();
+    default:
+      return allSubjects
+          .where(
+            (s) =>
+                s.rotationWeek == RotationWeeks.none ||
+                s.rotationWeek == RotationWeeks.a ||
+                s.rotationWeek == RotationWeeks.b,
+          )
+          .toList();
+  }
+}
+
+/// Returns rotation week label of a Subject.
+String getSubjectRotationWeekLabel(SubjectData subject) {
+  switch (subject.rotationWeek) {
+    case RotationWeeks.a:
+      return "A";
+    case RotationWeeks.b:
+      return "B";
+    case RotationWeeks.none:
+      return "";
+    default:
+      return "";
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
index 1d44fdb..41838f3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,19 +1,13 @@
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/components/widgets/navigation_bar.dart';
 import 'package:timetable/constants/theme_options.dart';
-import 'package:timetable/models/settings.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/provider/themes.dart';
 
 void main() async {
-  await Hive.initFlutter();
-  Hive.registerAdapter(TimeOfDayAdapter());
-  Hive.registerAdapter(DaysAdapter());
-  Hive.registerAdapter(RotationWeeksAdapter());
-  Hive.registerAdapter(SubjectAdapter());
+  WidgetsFlutterBinding.ensureInitialized();
   runApp(
     const ProviderScope(
       child: Timetable(),
diff --git a/lib/models/days.g.dart b/lib/models/days.g.dart
deleted file mode 100644
index 6359ba1..0000000
--- a/lib/models/days.g.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-part of 'subjects.dart';
-
-class DaysAdapter extends TypeAdapter<Days> {
-  @override
-  final int typeId = 3;
-
-  @override
-  Days read(BinaryReader reader) {
-    final value = reader.readInt();
-    return Days.values[value];
-  }
-
-  @override
-  void write(BinaryWriter writer, Days obj) {
-    writer.writeInt(obj.index);
-  }
-}
diff --git a/lib/models/rotationWeeks.g.dart b/lib/models/rotationWeeks.g.dart
deleted file mode 100644
index bd5f165..0000000
--- a/lib/models/rotationWeeks.g.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-part of 'subjects.dart';
-
-class RotationWeeksAdapter extends TypeAdapter<RotationWeeks> {
-  @override
-  final int typeId = 4;
-
-  @override
-  RotationWeeks read(BinaryReader reader) {
-    final value = reader.readInt();
-    return RotationWeeks.values[value];
-  }
-
-  @override
-  void write(BinaryWriter writer, RotationWeeks obj) {
-    writer.writeInt(obj.index);
-  }
-}
diff --git a/lib/models/subjects.dart b/lib/models/subjects.dart
deleted file mode 100644
index 8141494..0000000
--- a/lib/models/subjects.dart
+++ /dev/null
@@ -1,135 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/constants/days.dart';
-import 'package:hive/hive.dart';
-import 'package:timetable/constants/rotation_weeks.dart';
-
-part 'timeOfDay.g.dart';
-part 'days.g.dart';
-part 'subjects.g.dart';
-part 'rotationWeeks.g.dart';
-
-/// Subject data model.
-@immutable
-@HiveType(typeId: 1)
-class Subject {
-  @HiveField(0)
-  final String label;
-  @HiveField(1)
-  final String? location;
-  @HiveField(2)
-  final Color color;
-  @HiveField(3)
-  final TimeOfDay startTime;
-  @HiveField(4)
-  final TimeOfDay endTime;
-  @HiveField(5)
-  final Days day;
-  @HiveField(6)
-  final RotationWeeks rotationWeek;
-  @HiveField(7)
-  final String? note;
-
-  const Subject({
-    required this.label,
-    required this.location,
-    required this.color,
-    required this.startTime,
-    required this.endTime,
-    required this.day,
-    required this.rotationWeek,
-    required this.note,
-  });
-
-  Subject copyWith({
-    String? label,
-    String? location,
-    Color? color,
-    TimeOfDay? startTime,
-    TimeOfDay? endTime,
-    Days? day,
-    RotationWeeks? rotationWeek,
-    String? note,
-  }) {
-    return Subject(
-      label: label ?? this.label,
-      location: location ?? this.location,
-      color: color ?? this.color,
-      startTime: startTime ?? this.startTime,
-      endTime: endTime ?? this.endTime,
-      day: day ?? this.day,
-      rotationWeek: rotationWeek ?? this.rotationWeek,
-      note: note ?? this.note,
-    );
-  }
-}
-
-/// Subject's [StateNotifier].
-class SubjectNotifier extends StateNotifier<List<Subject>> {
-  SubjectNotifier() : super([]) {
-    loadData();
-  }
-
-  void loadData() async {
-    var box = await Hive.openBox<List<dynamic>>("subjectBox");
-
-    final subjects = box.get(0) ?? [];
-    state = [...subjects];
-  }
-
-  void addSubject(Subject subject) {
-    state = [...state, subject];
-    saveData();
-  }
-
-  void removeSubject(Subject subject, List<List<Subject>> overlappingSubjects) {
-    state = state.where((s) => s != subject).toList();
-    overlappingSubjects = overlappingSubjects
-        .where(
-          (list) => !list.contains(subject),
-        )
-        .toList();
-    saveData();
-  }
-
-  void resetData() async {
-    var box = await Hive.openBox<List<dynamic>>("subjectBox");
-
-    box.deleteAll(box.keys);
-    state = [];
-  }
-
-  void updateSubject(Subject oldSubject, Subject newSubject) {
-    state = [
-      for (final subject in state)
-        if (subject == oldSubject)
-          subject.copyWith(
-            label: newSubject.label,
-            location: newSubject.location,
-            color: newSubject.color,
-            startTime: newSubject.startTime,
-            endTime: newSubject.endTime,
-            day: newSubject.day,
-            rotationWeek: newSubject.rotationWeek,
-            note: newSubject.note,
-          )
-        else
-          subject,
-    ];
-    saveData();
-  }
-
-  void saveData() async {
-    var box = await Hive.openBox<List<dynamic>>("subjectBox");
-
-    try {
-      box.putAt(0, state);
-    } catch (e) {
-      box.add(state);
-    }
-  }
-}
-
-final subjectProvider = StateNotifierProvider<SubjectNotifier, List<Subject>>(
-  (ref) => SubjectNotifier(),
-);
diff --git a/lib/models/subjects.g.dart b/lib/models/subjects.g.dart
deleted file mode 100644
index f71493c..0000000
--- a/lib/models/subjects.g.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-part of 'subjects.dart';
-
-class SubjectAdapter extends TypeAdapter<Subject> {
-  @override
-  final int typeId = 1;
-
-  @override
-  Subject read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Subject(
-      label: fields[0] as String,
-      location: fields[1] as String?,
-      color: Color(fields[2] as int),
-      startTime: fields[3] as TimeOfDay,
-      endTime: fields[4] as TimeOfDay,
-      day: fields[5] as Days,
-      rotationWeek: fields[6] as RotationWeeks,
-      note: fields[7] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Subject obj) {
-    writer
-      ..writeByte(8)
-      ..writeByte(0)
-      ..write(obj.label)
-      ..writeByte(1)
-      ..write(obj.location)
-      ..writeByte(2)
-      ..write(obj.color.value)
-      ..writeByte(3)
-      ..write(obj.startTime)
-      ..writeByte(4)
-      ..write(obj.endTime)
-      ..writeByte(5)
-      ..write(obj.day)
-      ..writeByte(6)
-      ..write(obj.rotationWeek)
-      ..writeByte(7)
-      ..write(obj.note);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is SubjectAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
diff --git a/lib/models/timeOfDay.g.dart b/lib/models/timeOfDay.g.dart
deleted file mode 100644
index a40da47..0000000
--- a/lib/models/timeOfDay.g.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-part of 'subjects.dart';
-
-class TimeOfDayAdapter extends TypeAdapter<TimeOfDay> {
-  @override
-  final typeId = 2;
-
-  @override
-  void write(BinaryWriter writer, TimeOfDay obj) {
-    writer
-      ..writeByte(2)
-      ..writeByte(0)
-      ..write(obj.hour)
-      ..writeByte(1)
-      ..write(obj.minute);
-  }
-
-  @override
-  TimeOfDay read(BinaryReader reader) {
-    var numOfFields = reader.readByte();
-    var fields = <int, dynamic>{
-      for (var i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return TimeOfDay(hour: fields[0] as int, minute: fields[1] as int);
-  }
-}
diff --git a/lib/models/overlapping_subjects.dart b/lib/provider/overlapping_subjects.dart
similarity index 84%
rename from lib/models/overlapping_subjects.dart
rename to lib/provider/overlapping_subjects.dart
index 8110049..e8759a6 100644
--- a/lib/models/overlapping_subjects.dart
+++ b/lib/provider/overlapping_subjects.dart
@@ -1,12 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timetable/models/subjects.dart';
+import 'package:timetable/db/database.dart';
 
 /// A [StateNotifier] that holds the list of overlapping subjects.
-class OverlappingSubjects extends StateNotifier<List<List<Subject>>> {
+class OverlappingSubjects extends StateNotifier<List<List<SubjectData>>> {
   OverlappingSubjects() : super([]);
 }
 
 final overlappingSubjectsProvider =
-    StateNotifierProvider<OverlappingSubjects, List<List<Subject>>>(
+    StateNotifierProvider<OverlappingSubjects, List<List<SubjectData>>>(
   (ref) => OverlappingSubjects(),
 );
diff --git a/lib/models/settings.dart b/lib/provider/settings.dart
similarity index 78%
rename from lib/models/settings.dart
rename to lib/provider/settings.dart
index b36c20d..b8ab815 100644
--- a/lib/models/settings.dart
+++ b/lib/provider/settings.dart
@@ -1,67 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-
-/// Settings data model.
-class Settings {
-  final bool customTimePeriod;
-  final bool compactMode;
-  final bool hideLocation;
-  final bool singleLetterDays;
-  final bool rotationWeeks;
-  final TimeOfDay customStartTime;
-  final TimeOfDay customEndTime;
-  final bool hideSunday;
-  final bool autoCompleteColor;
-  final bool hideTransparentSubject;
-  final bool navbarVisible;
-  final bool monetTheming;
-
-  Settings({
-    this.customTimePeriod = false,
-    this.compactMode = false,
-    this.hideLocation = false,
-    this.singleLetterDays = false,
-    this.rotationWeeks = false,
-    this.customStartTime = const TimeOfDay(hour: 08, minute: 00),
-    this.customEndTime = const TimeOfDay(hour: 18, minute: 00),
-    this.hideSunday = false,
-    this.autoCompleteColor = true,
-    this.hideTransparentSubject = true,
-    this.navbarVisible = true,
-    this.monetTheming = false,
-  });
-
-  Settings copy({
-    bool? customTimePeriod,
-    bool? compactMode,
-    bool? hideLocation,
-    bool? singleLetterDays,
-    bool? rotationWeeks,
-    TimeOfDay? customStartTime,
-    TimeOfDay? customEndTime,
-    bool? hideSunday,
-    bool? autoCompleteColor,
-    bool? hideTransparentSubject,
-    bool? navbarVisible,
-    bool? monetTheming,
-  }) =>
-      Settings(
-        customTimePeriod: customTimePeriod ?? this.customTimePeriod,
-        compactMode: compactMode ?? this.compactMode,
-        hideLocation: hideLocation ?? this.hideLocation,
-        singleLetterDays: singleLetterDays ?? this.singleLetterDays,
-        rotationWeeks: rotationWeeks ?? this.rotationWeeks,
-        customStartTime: customStartTime ?? this.customStartTime,
-        customEndTime: customEndTime ?? this.customEndTime,
-        hideSunday: hideSunday ?? this.hideSunday,
-        autoCompleteColor: autoCompleteColor ?? this.autoCompleteColor,
-        hideTransparentSubject:
-            hideTransparentSubject ?? this.hideTransparentSubject,
-        navbarVisible: navbarVisible ?? this.navbarVisible,
-        monetTheming: monetTheming ?? this.monetTheming,
-      );
-}
+import 'package:timetable/db/models/settings.dart';
 
 /// Settings' [StateNotifier].
 class SettingsNotifier extends StateNotifier<Settings> {
diff --git a/lib/provider/subjects.dart b/lib/provider/subjects.dart
new file mode 100644
index 0000000..c11574d
--- /dev/null
+++ b/lib/provider/subjects.dart
@@ -0,0 +1,64 @@
+import 'package:drift/drift.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import 'package:timetable/db/database.dart';
+import 'package:timetable/provider/overlapping_subjects.dart';
+
+class SubjNotifier extends StateNotifier<List<SubjectData>> {
+  AppDatabase db;
+  List<List<SubjectData>> overlappingSubjects;
+
+  SubjNotifier(
+    this.db,
+    this.overlappingSubjects,
+  ) : super([]) {
+    getSubjects();
+  }
+
+  Future<List<SubjectData>> getSubjects() async {
+    final subjects = await db.subject.select().get();
+    state = subjects;
+    return subjects;
+  }
+
+  Future addSubject(SubjectCompanion entry) async {
+    db.subject.insertOne(
+      SubjectCompanion.insert(
+        label: entry.label.value,
+        location: entry.location,
+        note: entry.note,
+        color: entry.color.value,
+        rotationWeek: entry.rotationWeek.value,
+        day: entry.day.value,
+        startTime: entry.startTime.value,
+        endTime: entry.endTime.value,
+      ),
+    );
+
+    state = await getSubjects();
+  }
+
+  Future updateSubject(SubjectData entry) async {
+    db.subject.update().replace(entry);
+
+    state = await getSubjects();
+  }
+
+  Future deleteSubject(SubjectData entry) async {
+    db.subject.deleteWhere((t) => t.id.equals(entry.id));
+    overlappingSubjects.removeWhere((e) => e.contains(entry));
+
+    state = await getSubjects();
+  }
+
+  void resetData() {
+    db.subject.delete();
+
+    state = [];
+  }
+}
+
+final subjProvider = StateNotifierProvider<SubjNotifier, List<SubjectData>>(
+  (ref) => SubjNotifier(
+      ref.watch(AppDatabase.provider), ref.watch(overlappingSubjectsProvider)),
+);
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 49b013d..d766eaf 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -5,13 +5,16 @@ import 'package:timetable/components/settings/customize_timetable.dart';
 import 'package:timetable/components/settings/theme_options.dart';
 import 'package:timetable/components/settings/timetable_data.dart';
 import 'package:timetable/components/settings/timetable_features.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/components/widgets/navigation_bar_toggle.dart';
+import 'package:timetable/provider/settings.dart';
 import 'package:timetable/provider/themes.dart';
 
 /// Settings Screen, groups all settings ([CustomizeTimetableOptions], [TimetableDataOptions],
 ///  [TimetableFeaturesOptions] and [ThemeOptions]) together.
 class SettingsScreen extends ConsumerWidget {
-  const SettingsScreen({super.key});
+  const SettingsScreen({
+    super.key,
+  });
 
   Future<int> getAndroidVersion() async {
     DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
@@ -24,10 +27,12 @@ class SettingsScreen extends ConsumerWidget {
     final themeMode = ref.read(themeModeProvider.notifier);
     final monetTheming = ref.watch(settingsProvider).monetTheming;
     final settings = ref.read(settingsProvider.notifier);
+    final navbarToggle = ref.watch(settingsProvider).navbarVisible;
 
     return Scaffold(
       appBar: AppBar(
         title: const Text("Settings"),
+        leading: navbarToggle ? null : const NavbarToggle(),
       ),
       body: SingleChildScrollView(
         child: Column(
diff --git a/lib/screens/timetable_screen.dart b/lib/screens/timetable_screen.dart
index 0381d69..54f6176 100644
--- a/lib/screens/timetable_screen.dart
+++ b/lib/screens/timetable_screen.dart
@@ -3,99 +3,48 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:timetable/components/timetable_views/day_view.dart';
 import 'package:timetable/components/timetable_views/grid_view.dart';
+import 'package:timetable/components/widgets/grid_day_views_toggle.dart';
+import 'package:timetable/components/widgets/navigation_bar_toggle.dart';
+import 'package:timetable/components/widgets/rotation_week_toggle.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
-import 'package:timetable/models/settings.dart';
+import 'package:timetable/provider/settings.dart';
+import 'package:timetable/provider/subjects.dart';
 
 /// The main screen, displays the default timetable view.
-/// groups [TimetableGridView] & [TimetableDayView].
+/// basically groups [TimetableGridView] & [TimetableDayView].
 class TimetableScreen extends HookConsumerWidget {
   const TimetableScreen({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final rotationWeeks = ref.watch(settingsProvider).rotationWeeks;
-    final navbarToggle = ref.watch(settingsProvider).navbarVisible;
-    final settings = ref.read(settingsProvider.notifier);
-
     final isGridView = useState(true);
     final rotationWeek = useState(RotationWeeks.all);
 
-    List<RotationWeeks> labels = [
-      RotationWeeks.all,
-      RotationWeeks.a,
-      RotationWeeks.b,
-    ];
-
-    final clickCount = useState(0);
-
-    void changeLabel() {
-      clickCount.value++;
-      if (clickCount.value >= 3) {
-        clickCount.value = 0;
-      }
-    }
+    final subject = ref.watch(subjProvider);
 
     return Scaffold(
       appBar: AppBar(
-          title: Row(
-            children: [
-              IconButton(
-                onPressed: () {
-                  settings.updateNavbarVisible(!navbarToggle);
-                },
-                selectedIcon: const Icon(
-                  Icons.fullscreen,
-                  size: 25,
-                ),
-                icon: const Icon(
-                  Icons.close_fullscreen_outlined,
-                  size: 20,
-                ),
-                isSelected: navbarToggle,
-              ),
-              const SizedBox(
-                width: 5,
-              ),
-              const Text('Timetable'),
-            ],
+        leading: const NavbarToggle(),
+        title: const Text('Timetable'),
+        actions: [
+          if (rotationWeeks)
+            RotationWeekToggle(
+              rotationWeek: rotationWeek,
+            ),
+          GridDayViewsToggle(
+            isGridView: isGridView,
           ),
-          actions: [
-            if (rotationWeeks)
-              InkWell(
-                onTap: () {
-                  changeLabel();
-                  rotationWeek.value = labels[clickCount.value];
-                },
-                borderRadius: BorderRadius.circular(50),
-                child: Ink(
-                  width: 40,
-                  height: 40,
-                  child: Center(
-                    child: Text(
-                      getRotationWeekButtonLabel(labels[clickCount.value]),
-                      style: const TextStyle(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 16,
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            IconButton(
-              onPressed: () {
-                isGridView.value = !isGridView.value;
-              },
-              selectedIcon: const Icon(Icons.view_agenda_outlined),
-              icon: const Icon(Icons.grid_view_outlined),
-              isSelected: isGridView.value,
-            )
-          ]),
+        ],
+      ),
       body: isGridView.value
           ? TimetableGridView(
               rotationWeek: rotationWeek,
+              subject: subject,
             )
           : TimetableDayView(
               rotationWeek: rotationWeek,
+              subject: subject,
             ),
     );
   }
diff --git a/pubspec.lock b/pubspec.lock
index da23f48..590e0ff 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,26 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
       url: "https://pub.dev"
     source: hosted
-    version: "64.0.0"
+    version: "61.0.0"
   analyzer:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: analyzer
-      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "5.13.0"
+  analyzer_plugin:
+    dependency: transitive
+    description:
+      name: analyzer_plugin
+      sha256: c1d5f167683de03d5ab6c3b53fc9aeefc5d59476e7810ba7bbddff50c6f4392d
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.2"
   animations:
     dependency: "direct main"
     description:
@@ -77,18 +85,18 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: d912852cce27c9e80a93603db721c267716894462e7033165178b91138587972
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.7"
   build_runner_core:
     dependency: transitive
     description:
@@ -121,6 +129,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -129,6 +145,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -149,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -173,10 +197,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.2"
   device_info_plus:
     dependency: "direct main"
     description:
@@ -193,6 +217,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  drift:
+    dependency: "direct main"
+    description:
+      name: drift
+      sha256: "05363b695885c72036ed5c76287125bfc6f1deda20cb3aa044a09fe22792f81b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.14.1"
+  drift_dev:
+    dependency: "direct dev"
+    description:
+      name: drift_dev
+      sha256: "50c14b8248d133d36b41c1b08ceed138be869b5b98ccaf3af16c9b88c7adc54e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.14.1"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -304,30 +344,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.1"
-  hive:
-    dependency: "direct main"
-    description:
-      name: hive
-      sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.3"
-  hive_flutter:
-    dependency: "direct main"
-    description:
-      name: hive_flutter
-      sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  hive_generator:
-    dependency: "direct dev"
-    description:
-      name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
   hooks_riverpod:
     dependency: "direct main"
     description:
@@ -412,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -441,7 +457,7 @@ packages:
     source: hosted
     version: "2.1.0"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
@@ -449,7 +465,7 @@ packages:
     source: hosted
     version: "1.8.3"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
       sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
@@ -536,6 +552,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.3"
+  recase:
+    dependency: transitive
+    description:
+      name: recase
+      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   riverpod:
     dependency: transitive
     description:
@@ -629,14 +653,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
-  source_helper:
-    dependency: transitive
-    description:
-      name: source_helper
-      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.4"
   source_span:
     dependency: transitive
     description:
@@ -645,14 +661,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sqlite3:
+    dependency: "direct main"
+    description:
+      name: sqlite3
+      sha256: "8922805564b78eb7aa9386c10056d377a541ac7270dc6a1589176277ebb4d15d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  sqlite3_flutter_libs:
+    dependency: "direct main"
+    description:
+      name: sqlite3_flutter_libs
+      sha256: "3e3583b77cf888a68eae2e49ee4f025f66b86623ef0d83c297c8d903daa14871"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.18"
+  sqlparser:
+    dependency: transitive
+    description:
+      name: sqlparser
+      sha256: "877fcefabb725d120e31f54fa669a98c002db0feeaca6cea5354543f03b5e906"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.33.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
@@ -665,10 +705,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -697,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -737,10 +777,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -782,5 +822,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
+  dart: ">=3.2.0 <4.0.0"
   flutter: ">=3.7.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index c47b3d7..5e6fa73 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,23 +38,25 @@ dependencies:
   flutter_hooks: ^0.20.1
   hooks_riverpod: ^2.3.10
   non_uniform_border: ^1.0.0
-  hive: ^2.2.3
-  hive_flutter: ^1.1.0
   device_info_plus: ^9.0.3
-  
+  drift: ^2.14.1
+  sqlite3_flutter_libs: ^0.5.18
+  path_provider: ^2.1.1
+  path: ^1.8.3
+  sqlite3: 
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  hive_generator:
-  build_runner:
-
+  build_runner: ^2.4.7
+  analyzer:
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^2.0.0
+  drift_dev: ^2.14.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec