diff --git a/.metadata b/.metadata
index 9fe72b1..bef11fe 100644
--- a/.metadata
+++ b/.metadata
@@ -4,8 +4,8 @@
 # This file should be version controlled.
 
 version:
-  revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-  channel: beta
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+  channel: stable
 
 project_type: app
 
@@ -13,23 +13,23 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: android
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: ios
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: linux
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: macos
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
     - platform: windows
-      create_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
-      base_revision: 75927305ff855f76a9ef704f9b4a86fa2fce7292
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
 
   # User provided section
 
diff --git a/README.md b/README.md
index 6a1105a..7f79e9c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,7 @@
 # Daily Diary
 
-
-<img src="https://img.shields.io/f-droid/v/com.voklen.daily_diary.svg?logo=F-Droid"
-     alt="F-droid version">
-<img src="https://img.shields.io/github/v/release/Voklen/daily-diary.svg?logo=github"
-     alt="Github version">
+[![Github version](https://img.shields.io/github/v/release/Voklen/daily-diary.svg?logo=github)](https://github.com/Voklen/Daily-Diary/releases/latest)
+[![F-droid version](https://img.shields.io/f-droid/v/com.voklen.daily_diary.svg?logo=F-Droid)](https://f-droid.org/packages/com.voklen.daily_diary/)
 
 Jot down whatever you want throughout the day and the app will reset the next morning. All previous days are stored in plaintext files which can be exported and moved to a different device.
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6cfd9ad..920b44d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,6 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace "com.voklen.daily_diary"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 5e0b3bc..399f698 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.voklen.daily_diary">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d966a5f..9cf1fad 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.voklen.daily_diary">
-   <application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
         android:label="Daily Diary"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 5e0b3bc..399f698 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.voklen.daily_diary">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/build.gradle b/android/build.gradle
index 58a8c74..5264885 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift
new file mode 100644
index 0000000..86a7c3b
--- /dev/null
+++ b/ios/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/lib/backend_classes/filenames.dart b/lib/backend_classes/filenames.dart
new file mode 100644
index 0000000..c09c138
--- /dev/null
+++ b/lib/backend_classes/filenames.dart
@@ -0,0 +1,86 @@
+import 'package:daily_diary/main.dart';
+
+class Filename {
+  static String dateToFilename(DateTime date, {String? dateFormat}) {
+    String filename = dateFormat ?? App.settingsNotifier.value.dateFormat;
+    filename = filename.replaceAll('%Y', _twoDigits(date.year));
+    filename = filename.replaceAll('%M', _twoDigits(date.month));
+    filename = filename.replaceAll('%D', _twoDigits(date.day));
+    return filename;
+  }
+
+  static String _twoDigits(int n) {
+    if (n >= 10) return "$n";
+    return "0$n";
+  }
+
+  static DateTime? filenameToDate(String filename) {
+    String dateFormat = App.settingsNotifier.value.dateFormat;
+    _Order order = _Order(dateFormat);
+
+    String regexString = dateFormat
+        .replaceFirst('%Y', r'(\d+)')
+        .replaceFirst('%M', r'(\d+)')
+        .replaceFirst('%D', r'(\d+)');
+    RegExp regex = RegExp(regexString);
+
+    // Find all matches of the pattern in the expression
+    final RegExpMatch? matches = regex.firstMatch(filename);
+    if (matches == null) return null;
+
+    // The groups cannot be null because the regex has 3 groups and so all must exist
+    int year = int.parse(matches.group(order.year)!);
+    int month = int.parse(matches.group(order.month)!);
+    int day = int.parse(matches.group(order.day)!);
+    return DateTime(year, month, day);
+  }
+}
+
+class _Order {
+  late int year;
+  late int month;
+  late int day;
+
+  _Order(String dateFormat) {
+    int yearLocation = dateFormat.indexOf('%Y');
+    int monthLocation = dateFormat.indexOf('%M');
+    int dayLocation = dateFormat.indexOf('%D');
+
+    if (yearLocation < monthLocation && monthLocation < dayLocation) {
+      year = 1;
+      month = 2;
+      day = 3;
+      return;
+    }
+    if (yearLocation < dayLocation && dayLocation < monthLocation) {
+      year = 1;
+      day = 2;
+      month = 3;
+      return;
+    }
+    if (monthLocation < yearLocation && yearLocation < dayLocation) {
+      month = 1;
+      year = 2;
+      day = 3;
+      return;
+    }
+    if (monthLocation < dayLocation && dayLocation < yearLocation) {
+      month = 1;
+      day = 2;
+      year = 3;
+      return;
+    }
+    if (dayLocation < yearLocation && yearLocation < monthLocation) {
+      day = 1;
+      year = 2;
+      month = 3;
+      return;
+    }
+    if (dayLocation < monthLocation && monthLocation < yearLocation) {
+      day = 1;
+      month = 2;
+      year = 3;
+      return;
+    }
+  }
+}
diff --git a/lib/path.dart b/lib/backend_classes/path.dart
similarity index 89%
rename from lib/path.dart
rename to lib/backend_classes/path.dart
index fa040ef..5df607a 100644
--- a/lib/path.dart
+++ b/lib/backend_classes/path.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 
 import 'package:daily_diary/main.dart';
 
-import 'package:path_provider/path_provider.dart';
-import 'package:shared_storage/saf.dart';
+import 'package:path_provider/path_provider.dart' as path_prov;
+import 'package:shared_storage/shared_storage.dart';
 
 class SavePath {
   // Due to the constructors only one can ever be null at any time
@@ -54,7 +54,7 @@ class SavePath {
       return file;
     }
     DocumentFile? createdFile =
-        await createFile(uri!, mimeType: 'text/plain', displayName: filename);
+        await createFile(uri!, mimeType: '', displayName: filename);
     return createdFile!;
   }
 }
@@ -98,12 +98,12 @@ Future<String> get _defaultPath async {
 Future<Directory> get _directory async {
   WidgetsFlutterBinding.ensureInitialized();
   if (Platform.isAndroid) {
-    final directory = await getExternalStorageDirectory();
+    final directory = await path_prov.getExternalStorageDirectory();
     if (directory != null) {
       return directory;
     }
   }
 
-  final directory = await getApplicationDocumentsDirectory();
+  final directory = await path_prov.getApplicationDocumentsDirectory();
   return directory;
 }
diff --git a/lib/settings_notifier.dart b/lib/backend_classes/settings_notifier.dart
similarity index 77%
rename from lib/settings_notifier.dart
rename to lib/backend_classes/settings_notifier.dart
index a75d50d..11078aa 100644
--- a/lib/settings_notifier.dart
+++ b/lib/backend_classes/settings_notifier.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 
-import 'package:daily_diary/path.dart';
-import 'package:daily_diary/storage.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
 
 class Settings {
   ThemeMode theme = ThemeMode.system;
   double fontSize = 16;
   Color colorScheme = const Color.fromARGB(255, 152, 85, 211);
   bool checkSpelling = true;
+  String dateFormat = '%Y-%M-%D.txt';
 }
 
 class SettingsNotifier extends ValueNotifier<Settings> {
@@ -33,6 +34,10 @@ class SettingsNotifier extends ValueNotifier<Settings> {
     await setCheckSpelling(await storage.getCheckSpelling());
   }
 
+  Future<void> setDateFormatFromFile() async {
+    await setDateFormat(await storage.getDateFormat());
+  }
+
   Future<void> setThemeToDefault() async {
     await setTheme(Settings().theme);
   }
@@ -49,6 +54,10 @@ class SettingsNotifier extends ValueNotifier<Settings> {
     await setCheckSpelling(Settings().checkSpelling);
   }
 
+  Future<void> setDateFormatToDefault() async {
+    await setDateFormat(Settings().dateFormat);
+  }
+
   Future<void> setTheme(ThemeMode? theme) async {
     if (theme == null) {
       return;
@@ -78,10 +87,19 @@ class SettingsNotifier extends ValueNotifier<Settings> {
 
   Future<void> setCheckSpelling(bool? checkSpelling) async {
     if (checkSpelling == null) {
-      return Future(() => null);
+      return;
     }
     value.checkSpelling = checkSpelling;
     await storage.setCheckSpelling(checkSpelling);
     notifyListeners();
   }
+
+  Future<void> setDateFormat(String? dateFormat) async {
+    if (dateFormat == null) {
+      return;
+    }
+    value.dateFormat = dateFormat;
+    await storage.setDateFormat(dateFormat);
+    notifyListeners();
+  }
 }
diff --git a/lib/storage.dart b/lib/backend_classes/storage.dart
similarity index 78%
rename from lib/storage.dart
rename to lib/backend_classes/storage.dart
index 36257ac..b1635cd 100644
--- a/lib/storage.dart
+++ b/lib/backend_classes/storage.dart
@@ -2,10 +2,11 @@ import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
 
-import 'package:daily_diary/path.dart';
+import 'package:daily_diary/backend_classes/filenames.dart';
+import 'package:daily_diary/backend_classes/path.dart';
 
 import 'package:flutter_colorpicker/flutter_colorpicker.dart';
-import 'package:shared_storage/saf.dart';
+import 'package:shared_storage/shared_storage.dart';
 import 'package:toml/toml.dart';
 
 class DiaryStorage {
@@ -14,16 +15,16 @@ class DiaryStorage {
   final SavePath path;
   DateTime date = DateTime.now();
 
-  String get isoDate => date.toIso8601String().substring(0, 10);
+  String get filename => Filename.dateToFilename(date);
 
   File get file {
-    return File('${path.path}/$isoDate.txt');
+    return File('${path.path}/$filename');
   }
 
   Future<String> readFile() async {
     try {
       if (path.isScopedStorage) {
-        return path.getScopedFile('$isoDate.txt');
+        return path.getScopedFile(filename);
       }
       return await file.readAsString();
     } catch (error) {
@@ -34,11 +35,11 @@ class DiaryStorage {
   void writeFile(String text) async {
     if (path.isScopedStorage) {
       if (text.isNotEmpty) {
-        path.writeScopedFile('$isoDate.txt', text);
+        path.writeScopedFile(filename, text);
         return;
       }
-      if (await path.scopedExists('$isoDate.txt')) {
-        path.deleteScoped('$isoDate.txt');
+      if (await path.scopedExists(filename)) {
+        path.deleteScoped(filename);
         return;
       }
       return;
@@ -152,6 +153,15 @@ class SettingsStorage {
     await _writeToFile('check_spelling', checkSpelling);
   }
 
+  Future<String?> getDateFormat() async {
+    final dateFormat = await _getFromFile('date_format');
+    return dateFormat is String ? dateFormat : null;
+  }
+
+  Future<void> setDateFormat(String dateFormat) async {
+    await _writeToFile('date_format', dateFormat);
+  }
+
   Future<void> _writeToFile(key, value) async {
     var map = await settingsMap;
     map[key] = value;
@@ -175,28 +185,34 @@ class PreviousEntriesStorage {
   final SavePath path;
 
   Future<List<DateTime>> getFiles() async {
+    Stream<DateTime> datesStream;
     if (path.isScopedStorage) {
-      return _getFilesScopedStorage(path.uri!);
+      datesStream = await _getFilesScopedStorage();
+    } else {
+      datesStream = _getFilesNormal();
     }
+    List<DateTime> datesList = await datesStream.toList();
+    datesList.sort((b, a) => a.compareTo(b));
+    return datesList;
+  }
 
+  Stream<DateTime> _getFilesNormal() {
     final directory = Directory(path.path!);
     final files = directory.list();
     final filesAsDateTime = files.map(toFilenameFromFileEntity);
-    final filesWithoutNull =
-        filesAsDateTime.where((s) => s != null).cast<DateTime>();
-    final list = await filesWithoutNull.toList();
-    return list.reversed.toList();
+    final filesWithoutNull = filesAsDateTime.where((s) => s != null);
+    return filesWithoutNull.cast<DateTime>();
   }
 
-  Future<List<DateTime>> _getFilesScopedStorage(Uri uri) async {
+  Future<Stream<DateTime>> _getFilesScopedStorage() async {
+    Uri uri = path.uri!;
     if (await canRead(uri) == true) {
       //TODO handle lack of permissions
     }
     final files = listFiles(uri, columns: [DocumentFileColumn.displayName]);
     final filesAsDateTime = files.map(toFilenameFromDocumentFile);
-    final filesWithoutNull =
-        filesAsDateTime.where((s) => s != null).cast<DateTime>();
-    return filesWithoutNull.toList();
+    final filesWithoutNull = filesAsDateTime.where((s) => s != null);
+    return filesWithoutNull.cast<DateTime>();
   }
 
   DateTime? toFilenameFromFileEntity(FileSystemEntity file) {
@@ -209,10 +225,9 @@ class PreviousEntriesStorage {
 
   DateTime? toFilename(String path) {
     int filenameStart = path.lastIndexOf('/') + 1;
-    int filenameEnd = path.length - 4;
-    String isoDate = path.substring(filenameStart, filenameEnd);
+    String filename = path.substring(filenameStart);
     try {
-      return DateTime.parse(isoDate);
+      return Filename.filenameToDate(filename);
     } on FormatException {
       // Empty strings will be filtered after this map
       return null;
diff --git a/lib/main.dart b/lib/main.dart
index 462eee8..e554b92 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
-import 'package:daily_diary/path.dart';
-import 'package:daily_diary/settings_notifier.dart';
-import 'package:daily_diary/storage.dart';
-import 'package:daily_diary/themes.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/backend_classes/settings_notifier.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
+import 'package:daily_diary/widgets/themes.dart';
 import 'package:daily_diary/screens/home.dart';
 
 import 'package:shared_preferences/shared_preferences.dart';
@@ -12,11 +12,18 @@ import 'package:shared_preferences/shared_preferences.dart';
 bool? startupCheckSpelling;
 
 SavePath? savePath;
-SavePath? startupSavePath;
+SavePath? newSavePath;
 
 main() async {
+  await loadSettings();
+  runApp(const App());
+}
+
+Future<void> loadSettings() async {
   savePath = await getPath();
-  startupSavePath = savePath;
+  newSavePath = savePath;
+  // Date format must be set so on first load it reads the correct filename
+  App.settingsNotifier.setDateFormatFromFile();
   // Color and theme are loaded before the app starts
   // This is to make it not jarringly switch theme/color while loading
   // Other settings are loaded it the initState of the home page
@@ -25,7 +32,6 @@ main() async {
   // This will be moved to _loadSettings when spellCheckHasChanged is removed
   await App.settingsNotifier.setCheckSpellingFromFile();
   startupCheckSpelling = App.settingsNotifier.value.checkSpelling;
-  runApp(const App());
 }
 
 class App extends StatelessWidget {
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 21076bf..e974aeb 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'package:daily_diary/main.dart';
-import 'package:daily_diary/settings_notifier.dart';
-import 'package:daily_diary/storage.dart';
-import 'package:daily_diary/quit_handler.dart';
+import 'package:daily_diary/backend_classes/settings_notifier.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
+import 'package:daily_diary/widgets/quit_handler.dart';
 import 'package:daily_diary/screens/settings.dart';
 import 'package:daily_diary/screens/previous_entries.dart';
 
diff --git a/lib/screens/previous_entries.dart b/lib/screens/previous_entries.dart
index 78d8660..e36a1bd 100644
--- a/lib/screens/previous_entries.dart
+++ b/lib/screens/previous_entries.dart
@@ -4,7 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
 import 'package:daily_diary/main.dart';
-import 'package:daily_diary/storage.dart';
+import 'package:daily_diary/backend_classes/filenames.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
 import 'package:daily_diary/screens/view_only.dart';
 
 class PreviousEntriesScreen extends StatelessWidget {
@@ -22,7 +23,6 @@ class PreviousEntriesScreen extends StatelessWidget {
           future: entries.getFiles(),
           builder: (context, AsyncSnapshot<List<DateTime>> snapshot) {
             List<DateTime> datesList = snapshot.data ?? [];
-            datesList.sort((b, a) => a.compareTo(b));
             return ListView.builder(
               itemCount: datesList.length,
               itemBuilder: (_, index) => PreviousEntry(
@@ -53,8 +53,7 @@ class PreviousEntry extends StatelessWidget {
           context,
           MaterialPageRoute(
             builder: (context) {
-              String isoDate = date.toIso8601String().substring(0, 10);
-              String filename = '$isoDate.txt';
+              String filename = Filename.dateToFilename(date);
               final storage = PreviousEntryStorage(filename, savePath!);
               return ViewOnlyScreen(title: humanDate, storage: storage);
             },
diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
index 29b41f0..44a2f72 100644
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@@ -1,13 +1,6 @@
-import 'dart:convert';
-import 'dart:io';
 import 'package:flutter/material.dart';
 
-import 'package:daily_diary/main.dart';
-import 'package:daily_diary/path.dart';
-
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter_colorpicker/flutter_colorpicker.dart';
-import 'package:shared_storage/shared_storage.dart' as saf;
+import 'package:daily_diary/widgets/settings_widgets.dart';
 
 class SettingsScreen extends StatelessWidget {
   const SettingsScreen({super.key});
@@ -24,6 +17,7 @@ class SettingsScreen extends StatelessWidget {
             FontSetting(),
             SpellCheckToggle(),
             ColorSetting(),
+            DateFormatSetting(),
             SavePathSetting(),
           ],
         ),
@@ -42,26 +36,35 @@ class SettingsList extends StatefulWidget {
 }
 
 class _SettingsListState extends State<SettingsList> {
-  bool showResetOption = false;
+  bool showResetButtons = false;
 
   @override
   Widget build(BuildContext context) {
-    List<Widget> modifiedChildren = [
-      ElevatedButton(
-        onPressed: () => setState(() {
-          showResetOption = !showResetOption;
-        }),
-        child: Text(showResetOption ? 'Cancel' : 'Select settings to reset'),
-      ),
-    ];
-    modifiedChildren.addAll(widget.children.map(_modifyChild));
+    // The first item in the list is the Reset button
+    List<Widget> children = [buttonToShowResetButtons()];
+    // Then all the children are wrapped in `SettingsListElement`
+    // which allows a reset button to appear beside them
+    children.addAll(widget.children.map(_modifyChild));
+
+    return ListView(children: children);
+  }
 
-    return ListView(children: modifiedChildren);
+  Widget buttonToShowResetButtons() {
+    return ElevatedButton(
+      onPressed: toggleResetButtons,
+      child: Text(showResetButtons ? 'Cancel' : 'Select settings to reset'),
+    );
+  }
+
+  void toggleResetButtons() {
+    setState(() {
+      showResetButtons = !showResetButtons;
+    });
   }
 
   Widget _modifyChild(SettingTile element) {
     return SettingsListElement(
-      showResetOption: showResetOption,
+      showResetOption: showResetButtons,
       child: element,
     );
   }
@@ -120,322 +123,3 @@ abstract class SettingTile extends Widget {
 
   Future<SettingTile> newDefault();
 }
-
-const alertColor = Color.fromARGB(255, 240, 88, 50);
-
-class ThemeSetting extends StatefulWidget implements SettingTile {
-  const ThemeSetting({super.key});
-
-  @override
-  Future<ThemeSetting> newDefault() async {
-    await App.settingsNotifier.setThemeToDefault();
-    return ThemeSetting(
-      key: UniqueKey(),
-    );
-  }
-
-  @override
-  State<ThemeSetting> createState() => _ThemeSettingState();
-}
-
-class _ThemeSettingState extends State<ThemeSetting> {
-  List<bool> _selections = _getTheme();
-
-  static List<bool> _getTheme() {
-    switch (App.settingsNotifier.value.theme) {
-      case ThemeMode.light:
-        return [true, false, false];
-      case ThemeMode.system:
-        return [false, true, false];
-      case ThemeMode.dark:
-        return [false, false, true];
-    }
-  }
-
-  _setTheme(int index) {
-    switch (index) {
-      case 0:
-        App.settingsNotifier.setTheme(ThemeMode.light);
-        break;
-      case 1:
-        App.settingsNotifier.setTheme(ThemeMode.system);
-        break;
-      case 2:
-        App.settingsNotifier.setTheme(ThemeMode.dark);
-        break;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    _selections = _getTheme();
-    return Row(
-      children: [
-        Text(
-          "Theme:",
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-        const SizedBox(width: 5),
-        ToggleButtons(
-          isSelected: _selections,
-          onPressed: (int index) {
-            _selections = [false, false, false];
-            setState(() {
-              _selections[index] = true;
-            });
-            _setTheme(index);
-          },
-          renderBorder: false,
-          borderRadius: BorderRadius.circular(8),
-          children: const [
-            Text('Light'),
-            Text('System'),
-            Text('Dark'),
-          ],
-        ),
-      ],
-    );
-  }
-}
-
-class SpellCheckToggle extends StatefulWidget implements SettingTile {
-  const SpellCheckToggle({super.key});
-
-  @override
-  Future<SpellCheckToggle> newDefault() async {
-    await App.settingsNotifier.setCheckSpellingToDefault();
-    return SpellCheckToggle(
-      key: UniqueKey(),
-    );
-  }
-
-  @override
-  State<SpellCheckToggle> createState() => _SpellCheckToggleState();
-}
-
-class _SpellCheckToggleState extends State<SpellCheckToggle> {
-  _onChanged(bool checked) {
-    setState(() {
-      App.settingsNotifier.setCheckSpelling(checked);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Row(
-          children: [
-            Text(
-              'Check spelling:',
-              style: Theme.of(context).textTheme.titleMedium,
-            ),
-            const SizedBox(width: 5),
-            Switch(
-              value: App.settingsNotifier.value.checkSpelling,
-              onChanged: _onChanged,
-            )
-          ],
-        ),
-        Visibility(
-          visible:
-              startupCheckSpelling != App.settingsNotifier.value.checkSpelling,
-          child: const Text(
-            'Restart app for changes to take effect',
-            style: TextStyle(color: alertColor),
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class FontSetting extends StatelessWidget implements SettingTile {
-  const FontSetting({super.key});
-
-  @override
-  Future<FontSetting> newDefault() async {
-    await App.settingsNotifier.setFontSizeToDefault();
-    return FontSetting(
-      key: UniqueKey(),
-    );
-  }
-
-  static final _fontSizeController = TextEditingController(
-    text: App.settingsNotifier.value.fontSize.toString(),
-  );
-
-  _setFontSize(String fontSizeString) {
-    try {
-      final fontSize = double.parse(fontSizeString);
-      App.settingsNotifier.setFontSize(fontSize);
-    } on FormatException {
-      return;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    _fontSizeController.text = App.settingsNotifier.value.fontSize.toString();
-    return Row(
-      children: [
-        Text(
-          "Font size:",
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-        const SizedBox(width: 5),
-        SizedBox(
-          width: 48,
-          height: 24,
-          child: TextField(
-            controller: _fontSizeController,
-            onChanged: _setFontSize,
-            keyboardType: TextInputType.number,
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class ColorSetting extends StatelessWidget implements SettingTile {
-  const ColorSetting({super.key});
-
-  @override
-  Future<ColorSetting> newDefault() async {
-    await App.settingsNotifier.setColorSchemeToDefault();
-    return const ColorSetting();
-  }
-
-  _setColorScheme(Color colorScheme) {
-    App.settingsNotifier.setColorScheme(colorScheme);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          "App color scheme:",
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: ColorPicker(
-            pickerColor: App.settingsNotifier.value.colorScheme,
-            onColorChanged: _setColorScheme,
-            enableAlpha: false,
-            colorPickerWidth: 250,
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class SavePathSetting extends StatefulWidget implements SettingTile {
-  const SavePathSetting({super.key});
-
-  @override
-  Future<SavePathSetting> newDefault() async {
-    savePath = await resetPathToDefault();
-    return const SavePathSetting();
-  }
-
-  @override
-  State<SavePathSetting> createState() => _SavePathSettingState();
-}
-
-class _SavePathSettingState extends State<SavePathSetting> {
-  void _selectNewPath() async {
-    final path = await _askForPath();
-    if (path == null) {
-      // The user aborted the dialog or the folder path couldn't be resolved.
-      return;
-    }
-
-    setState(() {
-      savePath = path;
-    });
-  }
-
-  Future<SavePath?> _askForPath() async {
-    if (Platform.isAndroid) {
-      return _askForPathAndroid();
-    }
-    String? path = await FilePicker.platform.getDirectoryPath();
-    if (path == null) {
-      return null;
-    }
-
-    final preferences = await App.preferences;
-    preferences.setString('save_path', path);
-    preferences.setBool('is_android_scoped', false);
-    return SavePath.normal(path);
-  }
-
-  Future<SavePath?> _askForPathAndroid() async {
-    _removePreviousPermissions();
-
-    // Ask user for path and permissions
-    Uri? uri;
-    while (uri == null) {
-      uri = await saf.openDocumentTree();
-    }
-
-    // Only null before Android API 21, but this project is API 21+
-    final asDocumentFile = await uri.toDocumentFile();
-    Map asMap = asDocumentFile!.toMap();
-    String asString = json.encode(asMap);
-    final preferences = await App.preferences;
-    preferences.setString('save_path', asString);
-    preferences.setBool('is_android_scoped', true);
-    return SavePath.android(uri);
-  }
-
-  Future<void> _removePreviousPermissions() async {
-    SavePath? path = savePath;
-    if (path == null) return;
-
-    Uri? previousPath = path.uri;
-    if (previousPath == null) return;
-
-    await saf.releasePersistableUriPermission(previousPath);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Save Location:',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-        ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: 400),
-          child: TextField(
-            controller: TextEditingController(text: savePath!.string),
-            enabled: false,
-            style: Theme.of(context).textTheme.bodyMedium,
-          ),
-        ),
-        SizedBox(
-          width: 125,
-          child: ElevatedButton(
-            onPressed: _selectNewPath,
-            child: const Text('Change folder'),
-          ),
-        ),
-        Visibility(
-          visible: savePath != startupSavePath,
-          child: const Text(
-            'Restart app for changes to take effect',
-            style: TextStyle(color: alertColor),
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/screens/view_only.dart b/lib/screens/view_only.dart
index 34d82b8..3bf6d82 100644
--- a/lib/screens/view_only.dart
+++ b/lib/screens/view_only.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 import 'package:daily_diary/main.dart';
-import 'package:daily_diary/settings_notifier.dart';
-import 'package:daily_diary/storage.dart';
+import 'package:daily_diary/backend_classes/settings_notifier.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
 import 'package:daily_diary/screens/settings.dart';
 
 class ViewOnlyScreen extends StatefulWidget {
diff --git a/lib/quit_handler.dart b/lib/widgets/quit_handler.dart
similarity index 100%
rename from lib/quit_handler.dart
rename to lib/widgets/quit_handler.dart
diff --git a/lib/widgets/settings_widgets.dart b/lib/widgets/settings_widgets.dart
new file mode 100644
index 0000000..d938b76
--- /dev/null
+++ b/lib/widgets/settings_widgets.dart
@@ -0,0 +1,510 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:flutter/material.dart';
+
+import 'package:daily_diary/main.dart';
+import 'package:daily_diary/backend_classes/filenames.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/backend_classes/settings_notifier.dart';
+import 'package:daily_diary/screens/settings.dart';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:shared_storage/shared_storage.dart' as saf;
+
+const alertColor = Color.fromARGB(255, 240, 88, 50);
+
+class ThemeSetting extends StatefulWidget implements SettingTile {
+  const ThemeSetting({super.key});
+
+  @override
+  Future<ThemeSetting> newDefault() async {
+    await App.settingsNotifier.setThemeToDefault();
+    return ThemeSetting(
+      key: UniqueKey(),
+    );
+  }
+
+  @override
+  State<ThemeSetting> createState() => _ThemeSettingState();
+}
+
+class _ThemeSettingState extends State<ThemeSetting> {
+  List<bool> _selections = _getTheme();
+
+  static List<bool> _getTheme() {
+    switch (App.settingsNotifier.value.theme) {
+      case ThemeMode.light:
+        return [true, false, false];
+      case ThemeMode.system:
+        return [false, true, false];
+      case ThemeMode.dark:
+        return [false, false, true];
+    }
+  }
+
+  _setTheme(int index) {
+    switch (index) {
+      case 0:
+        App.settingsNotifier.setTheme(ThemeMode.light);
+        break;
+      case 1:
+        App.settingsNotifier.setTheme(ThemeMode.system);
+        break;
+      case 2:
+        App.settingsNotifier.setTheme(ThemeMode.dark);
+        break;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _selections = _getTheme();
+    return Row(
+      children: [
+        Text(
+          "Theme:",
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        const SizedBox(width: 5),
+        ToggleButtons(
+          isSelected: _selections,
+          onPressed: (int index) {
+            _selections = [false, false, false];
+            setState(() {
+              _selections[index] = true;
+            });
+            _setTheme(index);
+          },
+          renderBorder: false,
+          borderRadius: BorderRadius.circular(8),
+          children: const [
+            Text('Light'),
+            Text('System'),
+            Text('Dark'),
+          ],
+        ),
+      ],
+    );
+  }
+}
+
+class SpellCheckToggle extends StatefulWidget implements SettingTile {
+  const SpellCheckToggle({super.key});
+
+  @override
+  Future<SpellCheckToggle> newDefault() async {
+    await App.settingsNotifier.setCheckSpellingToDefault();
+    return SpellCheckToggle(
+      key: UniqueKey(),
+    );
+  }
+
+  @override
+  State<SpellCheckToggle> createState() => _SpellCheckToggleState();
+}
+
+class _SpellCheckToggleState extends State<SpellCheckToggle> {
+  _onChanged(bool checked) {
+    setState(() {
+      App.settingsNotifier.setCheckSpelling(checked);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          children: [
+            Text(
+              'Check spelling:',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(width: 5),
+            Switch(
+              value: App.settingsNotifier.value.checkSpelling,
+              onChanged: _onChanged,
+            )
+          ],
+        ),
+        Visibility(
+          visible:
+              startupCheckSpelling != App.settingsNotifier.value.checkSpelling,
+          child: const Text(
+            'Restart app for changes to take effect',
+            style: TextStyle(color: alertColor),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class FontSetting extends StatelessWidget implements SettingTile {
+  const FontSetting({super.key});
+
+  @override
+  Future<FontSetting> newDefault() async {
+    await App.settingsNotifier.setFontSizeToDefault();
+    return FontSetting(
+      key: UniqueKey(),
+    );
+  }
+
+  static final _fontSizeController = TextEditingController(
+    text: App.settingsNotifier.value.fontSize.toString(),
+  );
+
+  void _setFontSize(String fontSizeString) {
+    try {
+      final fontSize = double.parse(fontSizeString);
+      App.settingsNotifier.setFontSize(fontSize);
+    } on FormatException {
+      return;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _fontSizeController.text = App.settingsNotifier.value.fontSize.toString();
+    return Row(
+      children: [
+        Text(
+          "Font size:",
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        const SizedBox(width: 5),
+        SizedBox(
+          width: 48,
+          height: 24,
+          child: TextField(
+            controller: _fontSizeController,
+            onChanged: _setFontSize,
+            keyboardType: TextInputType.number,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ColorSetting extends StatelessWidget implements SettingTile {
+  const ColorSetting({super.key});
+
+  @override
+  Future<ColorSetting> newDefault() async {
+    await App.settingsNotifier.setColorSchemeToDefault();
+    return const ColorSetting();
+  }
+
+  _setColorScheme(Color colorScheme) {
+    App.settingsNotifier.setColorScheme(colorScheme);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "App color scheme:",
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: ColorPicker(
+            pickerColor: App.settingsNotifier.value.colorScheme,
+            onColorChanged: _setColorScheme,
+            enableAlpha: false,
+            colorPickerWidth: 250,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class DateFormatSetting extends StatefulWidget implements SettingTile {
+  const DateFormatSetting({super.key});
+
+  @override
+  Future<DateFormatSetting> newDefault() async {
+    String defaultDateFormat = Settings().dateFormat;
+    final renameFiles = RenameFiles(defaultDateFormat);
+    await renameFiles.rewriteExistingFiles();
+
+    await App.settingsNotifier.setDateFormatToDefault();
+    _dateFormatController.text = App.settingsNotifier.value.dateFormat;
+    return DateFormatSetting(
+      key: UniqueKey(),
+    );
+  }
+
+  static final _dateFormatController = TextEditingController(
+    text: App.settingsNotifier.value.dateFormat,
+  );
+
+  @override
+  State<DateFormatSetting> createState() => _DateFormatSettingState();
+}
+
+class _DateFormatSettingState extends State<DateFormatSetting> {
+  bool _askToPressEnter = false;
+
+  void _setDateFormat() async {
+    final newDateFormat = DateFormatSetting._dateFormatController.text;
+    if (_validator(newDateFormat) != null) return;
+
+    final renameFiles = RenameFiles(newDateFormat);
+    await renameFiles.rewriteExistingFiles();
+    App.settingsNotifier.setDateFormat(newDateFormat);
+    _checkIfAskToPressEnter(newDateFormat);
+  }
+
+  /// Returns null if okay, otherwise returns a string with a description of the error
+  String? _validator(value) {
+    if (value == null) {
+      return 'Cannot be empty';
+    }
+    const invalidChars = ['/', '<', '>', ':', '"', '\\', '|', '?', '*'];
+    for (int i = 0; i < invalidChars.length; i++) {
+      if (value.contains(invalidChars[i])) {
+        return 'Invalid character: ${invalidChars[i]}';
+      }
+    }
+    const requiredStrings = ['%Y', '%M', '%D'];
+    for (int i = 0; i < requiredStrings.length; i++) {
+      if (!value.contains(requiredStrings[i])) {
+        return 'Must contain: ${requiredStrings[i]}';
+      }
+    }
+    if (value[value.length - 1] == ' ' || value[value.length - 1] == '.') {
+      return 'Cannot end in a space or a dot';
+    }
+    return null;
+  }
+
+  void _checkIfAskToPressEnter(String value) {
+    if (value == App.settingsNotifier.value.dateFormat) {
+      setState(() {
+        _askToPressEnter = false;
+      });
+    } else {
+      setState(() {
+        _askToPressEnter = true;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'File name format:',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 400),
+          child: TextFormField(
+            autovalidateMode: AutovalidateMode.always,
+            validator: _validator,
+            onChanged: _checkIfAskToPressEnter,
+            controller: DateFormatSetting._dateFormatController,
+            onEditingComplete: _setDateFormat,
+            decoration: InputDecoration(
+              helperText: _askToPressEnter ? 'Press enter to save' : null,
+              helperStyle: const TextStyle(color: Colors.green),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class RenameFiles {
+  const RenameFiles(this.newDateFormat);
+
+  final String newDateFormat;
+
+  static final SavePath path = savePath!;
+
+  Future<void> rewriteExistingFiles() async {
+    if (path.isScopedStorage) {
+      await _getFilesScopedStorage();
+    } else {
+      await _getFilesNormal();
+    }
+  }
+
+  Future<void> _getFilesNormal() async {
+    final directory = Directory(path.path!);
+    final files = directory.list();
+    await files.forEach(renameFileEntity);
+  }
+
+  Future<void> _getFilesScopedStorage() async {
+    Uri uri = path.uri!;
+    if (await saf.canRead(uri) == true) {
+      //TODO handle lack of permissions
+    }
+    final files =
+        saf.listFiles(uri, columns: [saf.DocumentFileColumn.displayName]);
+    await files.forEach(renameDocumentFile);
+  }
+
+  void renameFileEntity(FileSystemEntity file) {
+    var oldFilename = file.path;
+    String? newFilename = getNewFilename(oldFilename);
+    if (newFilename != null) {
+      String newPath = changeFilenameInPath(file.path, newFilename);
+      file.rename(newPath);
+    }
+  }
+
+  void renameDocumentFile(saf.DocumentFile file) {
+    String oldFilename = file.name!;
+    String? newFilename = getNewFilename(oldFilename);
+    if (newFilename != null) {
+      file.renameTo(newFilename);
+    }
+  }
+
+  String changeFilenameInPath(String path, String replacement) {
+    int filenameStart = path.lastIndexOf('/') + 1;
+    return path.replaceRange(filenameStart, null, replacement);
+  }
+
+  String? getNewFilename(String oldFilename) {
+    DateTime? date = dateFromFilename(oldFilename);
+    if (date == null) {
+      return null;
+    }
+    String newFilename =
+        Filename.dateToFilename(date, dateFormat: newDateFormat);
+    if (newFilename == oldFilename) {
+      return null;
+    }
+    return newFilename;
+  }
+
+  DateTime? dateFromFilename(String path) {
+    int filenameStart = path.lastIndexOf('/') + 1;
+    String filename = path.substring(filenameStart);
+    try {
+      return Filename.filenameToDate(filename);
+    } on FormatException {
+      // Invalid files will be ignored
+      return null;
+    }
+  }
+}
+
+class SavePathSetting extends StatefulWidget implements SettingTile {
+  const SavePathSetting({super.key});
+
+  @override
+  Future<SavePathSetting> newDefault() async {
+    newSavePath = await resetPathToDefault();
+    return const SavePathSetting();
+  }
+
+  @override
+  State<SavePathSetting> createState() => _SavePathSettingState();
+}
+
+class _SavePathSettingState extends State<SavePathSetting> {
+  void _selectNewPath() async {
+    final path = await _askForPath();
+    if (path == null) {
+      // The user aborted the dialog or the folder path couldn't be resolved.
+      return;
+    }
+
+    setState(() {
+      newSavePath = path;
+    });
+  }
+
+  Future<SavePath?> _askForPath() async {
+    if (Platform.isAndroid) {
+      return _askForPathAndroid();
+    }
+    String? path = await FilePicker.platform.getDirectoryPath();
+    if (path == null) {
+      return null;
+    }
+
+    final preferences = await App.preferences;
+    preferences.setString('save_path', path);
+    preferences.setBool('is_android_scoped', false);
+    return SavePath.normal(path);
+  }
+
+  Future<SavePath?> _askForPathAndroid() async {
+    _removePreviousPermissions();
+
+    // Ask user for path and permissions
+    Uri? uri;
+    while (uri == null) {
+      uri = await saf.openDocumentTree();
+    }
+
+    // Only null before Android API 21, but this project is API 21+
+    final asDocumentFile = await uri.toDocumentFile();
+    Map asMap = asDocumentFile!.toMap();
+    String asString = json.encode(asMap);
+    final preferences = await App.preferences;
+    preferences.setString('save_path', asString);
+    preferences.setBool('is_android_scoped', true);
+    return SavePath.android(uri);
+  }
+
+  Future<void> _removePreviousPermissions() async {
+    SavePath? path = savePath;
+    if (path == null) return;
+
+    Uri? previousPath = path.uri;
+    if (previousPath == null) return;
+
+    await saf.releasePersistableUriPermission(previousPath);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Save Location:',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 400),
+          child: TextField(
+            controller: TextEditingController(text: newSavePath!.string),
+            enabled: false,
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+        ),
+        SizedBox(
+          width: 125,
+          child: ElevatedButton(
+            onPressed: _selectNewPath,
+            child: const Text('Change folder'),
+          ),
+        ),
+        Visibility(
+          visible: savePath!.string != newSavePath!.string,
+          child: const Text(
+            'Restart app for changes to take effect',
+            style: TextStyle(color: alertColor),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/themes.dart b/lib/widgets/themes.dart
similarity index 100%
rename from lib/themes.dart
rename to lib/widgets/themes.dart
diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift
new file mode 100644
index 0000000..5418c9f
--- /dev/null
+++ b/macos/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import FlutterMacOS
+import Cocoa
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/metadata/en-GB/changelogs/10.txt b/metadata/en-GB/changelogs/10.txt
new file mode 100644
index 0000000..3fb45af
--- /dev/null
+++ b/metadata/en-GB/changelogs/10.txt
@@ -0,0 +1,2 @@
+‣ Add a setting to change the filename format of entries, thanks @mstmob
+‣ Require restart after changing the save location
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index eac776c..98d707c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   file:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
+      sha256: "21145c9c268d54b1f771d8380c195d2d6f655e0567dc1ca2f9c134c02c819e0a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.10"
+    version: "5.3.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -98,18 +98,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "8ffe990dac54a4a5492747added38571a5ab474c8e5d196809ea08849c69b1bb"
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.15"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -148,18 +148,18 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.14"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -172,10 +172,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
@@ -188,58 +188,58 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4
+      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.0.15"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: da97262be945a72270513700a92b39dd2f4a54dad55d061687e2e37a6390366a
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.25"
+    version: "2.1.0"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.10"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.2.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: a9346a3fbba7546a28374bdbcd7f54ea48bb47772bf3a7ab4bfaadc40bc8b8c6
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "5.4.0"
   platform:
     dependency: transitive
     description:
@@ -252,82 +252,74 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
+    version: "2.1.5"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
+      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "7fa90471a6875d26ad78c7e4a675874b2043874586891128dc5899662c97db46"
+      sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.2.0"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07"
+      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.2"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa"
+      sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
+      sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5"
+      sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173"
+      sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   shared_storage:
     dependency: "direct main"
     description:
       name: shared_storage
-      sha256: "2761c1f6562d7cfb7626982d3fc7ce0bb1d9bf86ff7db2f6d77ee078d8f57de9"
+      sha256: "7c65a9d64f0f5521256be974cfd74010af12196657cec9f9fb7b03b2f11bcaf6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.8.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -377,10 +369,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   toml:
     dependency: "direct main"
     description:
@@ -401,18 +393,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
+      sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "5.0.6"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
 sdks:
-  dart: ">=2.19.0-374.1.beta <3.0.0"
+  dart: ">=3.0.0 <4.0.0"
   flutter: ">=3.3.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index a4c00d0..94c6742 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,10 +4,10 @@ description: A diary that starts with a blank page every day (while saving the p
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.2.5+9
+version: 1.3.0+10
 
 environment:
-  sdk: '>=2.19.0-374.1.beta <3.0.0'
+  sdk: '>=2.23.1 <3.0.0'
 
 dependencies:
   flutter:
@@ -24,7 +24,7 @@ dependencies:
   shared_preferences: ^2.0.15
   file_picker: ^5.2.4
   flutter_window_close: ^0.2.2
-  shared_storage: ^0.7.1
+  shared_storage: ^0.8.0
 
 dev_dependencies:
   flutter_test:
diff --git a/test/storage/diary_storage_test.dart b/test/storage/diary_storage_test.dart
index 5cd0387..c0946ca 100644
--- a/test/storage/diary_storage_test.dart
+++ b/test/storage/diary_storage_test.dart
@@ -1,11 +1,15 @@
 import 'dart:io';
 
-import 'package:daily_diary/path.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:daily_diary/storage.dart';
+import 'package:daily_diary/main.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
 
 main() {
+  //TODO Use something other than global variables in main.dart for savePath
+  // so hacks like this are not needed
+  savePath = const SavePath.normal('test_data/diary_storage_test/');
   Directory testDirectory = Directory('test_data/diary_storage_test/');
 
   setUp(() async {
@@ -13,7 +17,7 @@ main() {
   });
 
   test('Normal', () async {
-    final storage = DiaryStorage(const SavePath.normal('test_data/'));
+    final storage = DiaryStorage(savePath!);
     const testText = 'This is a test diary\n a newline here\nwow, another';
     storage.writeFile(testText);
     String result = await storage.readFile();
diff --git a/test/storage/settings_storage_test.dart b/test/storage/settings_storage_test.dart
index 6a8bbd1..15c4ac4 100644
--- a/test/storage/settings_storage_test.dart
+++ b/test/storage/settings_storage_test.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:daily_diary/path.dart';
-import 'package:daily_diary/storage.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/backend_classes/storage.dart';
 
 main() {
   Directory testDirectory = Directory('test_data/settings_storage_test');
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 9c1e0ac..f08eb7a 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -2,11 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:daily_diary/main.dart';
-import 'package:daily_diary/path.dart';
+import 'package:daily_diary/backend_classes/path.dart';
+import 'package:daily_diary/widgets/settings_widgets.dart';
 import 'package:daily_diary/screens/settings.dart';
 
 main() {
   savePath = const SavePath.normal('');
+  newSavePath = savePath;
+
   testWidgets('Navigation', (WidgetTester tester) async {
     await tester.pumpWidget(const App());
 
@@ -73,7 +76,7 @@ main() {
     expect(App.settingsNotifier.value.checkSpelling, true);
   });
 
-  testWidgets('Setting reset display', (WidgetTester tester) async {
+  testWidgets('Settings reset button display', (WidgetTester tester) async {
     await tester.pumpWidget(
       const MaterialApp(
         home: SettingsScreen(),
@@ -83,5 +86,11 @@ main() {
     await tester.tap(find.text('Select settings to reset'));
     await tester.pumpAndSettle();
     expect(find.byIcon(Icons.restore), findsWidgets);
+    expect(find.text('Select settings to reset'), findsNothing);
+
+    await tester.tap(find.text('Cancel'));
+    await tester.pumpAndSettle();
+    expect(find.text('Select settings to reset'), findsOneWidget);
+    expect(find.text('Cancel'), findsNothing);
   });
 }