diff --git a/lib/analytics.dart b/lib/analytics.dart
index a40dc75b..c6e0a6e2 100644
--- a/lib/analytics.dart
+++ b/lib/analytics.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:firebase_analytics/firebase_analytics.dart';
+
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Analytics getAnalytics() {
diff --git a/lib/apis/git_migration.dart b/lib/apis/git_migration.dart
index 188cd4a5..d1208bf2 100644
--- a/lib/apis/git_migration.dart
+++ b/lib/apis/git_migration.dart
@@ -2,11 +2,12 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+
 import 'package:git_bindings/git_bindings.dart';
+import 'package:path/path.dart' as p;
 
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:path/path.dart' as p;
 
 //
 // FIXME: This isn't ideal as we are skipping all the edits / deletes
diff --git a/lib/apis/github.dart b/lib/apis/github.dart
index b9af0195..fcf3e7ed 100644
--- a/lib/apis/github.dart
+++ b/lib/apis/github.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/services.dart';
+
 import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/apis/gitlab.dart b/lib/apis/gitlab.dart
index 66fcacaf..53cb4f3c 100644
--- a/lib/apis/gitlab.dart
+++ b/lib/apis/gitlab.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:flutter/services.dart';
+
 import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/app.dart b/lib/app.dart
index da98e4c8..0d363b9b 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,42 +1,37 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
-import 'package:firebase_analytics/observer.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/material.dart';
+
+import 'package:dart_git/git.dart';
+import 'package:device_info/device_info.dart';
+import 'package:dynamic_theme/dynamic_theme.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:easy_localization_loader/easy_localization_loader.dart';
+import 'package:firebase_analytics/observer.dart';
+import 'package:flutter_sentry/flutter_sentry.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+import 'package:provider/provider.dart';
+import 'package:quick_actions/quick_actions.dart';
+import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/iap.dart';
 import 'package:gitjournal/screens/filesystem_screen.dart';
 import 'package:gitjournal/screens/folder_listing.dart';
-import 'package:gitjournal/screens/tag_listing.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/purchase_screen.dart';
 import 'package:gitjournal/screens/purchase_thankyou_screen.dart';
-import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-import 'package:path/path.dart' as p;
-import 'package:flutter_sentry/flutter_sentry.dart';
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:easy_localization_loader/easy_localization_loader.dart';
-
-import 'package:dart_git/git.dart';
-
-import 'package:quick_actions/quick_actions.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-
+import 'package:gitjournal/screens/tag_listing.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/themes.dart';
-
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
-import 'package:path_provider/path_provider.dart';
-
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'screens/home_screen.dart';
 import 'screens/onboarding_screens.dart';
 import 'screens/settings_screen.dart';
diff --git a/lib/core/checklist.dart b/lib/core/checklist.dart
index b011102f..d38c3cf5 100644
--- a/lib/core/checklist.dart
+++ b/lib/core/checklist.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:gitjournal/error_reporting.dart';
 import 'package:meta/meta.dart';
 
 import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/error_reporting.dart';
 
 class ChecklistItem {
   bool checked;
diff --git a/lib/core/git_repo.dart b/lib/core/git_repo.dart
index 2ca860bc..8f2e95ab 100644
--- a/lib/core/git_repo.dart
+++ b/lib/core/git_repo.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 
+import 'package:dart_git/git.dart' as git;
 import 'package:git_bindings/git_bindings.dart';
 
 import 'package:gitjournal/core/note.dart';
@@ -11,8 +12,6 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:dart_git/git.dart' as git;
-
 class NoteRepoResult {
   bool error;
   String noteFilePath;
diff --git a/lib/core/link.dart b/lib/core/link.dart
index 1b2b70c0..67ec694e 100644
--- a/lib/core/link.dart
+++ b/lib/core/link.dart
@@ -1,5 +1,5 @@
-import 'package:meta/meta.dart';
 import 'package:markdown/markdown.dart' as md;
+import 'package:meta/meta.dart';
 
 class Link {
   String term;
diff --git a/lib/core/links_loader.dart b/lib/core/links_loader.dart
index d0e36bc1..b2ce17a9 100644
--- a/lib/core/links_loader.dart
+++ b/lib/core/links_loader.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:gitjournal/core/link.dart';
-import 'package:synchronized/synchronized.dart';
-import 'package:path/path.dart' as p;
-
 import 'package:markdown/markdown.dart' as md;
+import 'package:path/path.dart' as p;
+import 'package:synchronized/synchronized.dart';
+
+import 'package:gitjournal/core/link.dart';
 
 class LinksLoader {
   Isolate _isolate;
diff --git a/lib/core/md_yaml_doc.dart b/lib/core/md_yaml_doc.dart
index 35dc46c0..495841f0 100644
--- a/lib/core/md_yaml_doc.dart
+++ b/lib/core/md_yaml_doc.dart
@@ -1,4 +1,5 @@
 import 'dart:collection';
+
 import 'package:collection/collection.dart';
 
 Function _deepEq = const DeepCollectionEquality().equals;
diff --git a/lib/core/md_yaml_doc_codec.dart b/lib/core/md_yaml_doc_codec.dart
index 5c76e5ca..1955ae5b 100644
--- a/lib/core/md_yaml_doc_codec.dart
+++ b/lib/core/md_yaml_doc_codec.dart
@@ -2,8 +2,8 @@ import 'dart:collection';
 
 import 'package:yaml/yaml.dart';
 import 'package:yaml_serializer/yaml_serializer.dart';
-import 'package:gitjournal/utils/logger.dart';
 
+import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';
 
 class MarkdownYAMLCodec {
diff --git a/lib/core/note.dart b/lib/core/note.dart
index fd977ce0..8080511f 100644
--- a/lib/core/note.dart
+++ b/lib/core/note.dart
@@ -1,19 +1,17 @@
 import 'dart:io';
 
-import 'package:gitjournal/core/md_yaml_doc_loader.dart';
+import 'package:path/path.dart' as p;
+import 'package:uuid/uuid.dart';
+
 import 'package:gitjournal/core/links_loader.dart';
+import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 import 'package:gitjournal/core/note_notifier.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/markdown.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/datetime.dart';
-
-import 'package:path/path.dart' as p;
-
-import 'package:uuid/uuid.dart';
-
+import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/markdown.dart';
 import 'link.dart';
 import 'md_yaml_doc.dart';
 import 'md_yaml_doc_codec.dart';
diff --git a/lib/core/note_notifier.dart b/lib/core/note_notifier.dart
index 3792d7e3..74304fee 100644
--- a/lib/core/note_notifier.dart
+++ b/lib/core/note_notifier.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'note.dart';
 
diff --git a/lib/core/note_serializer.dart b/lib/core/note_serializer.dart
index 452f7583..555b9eff 100644
--- a/lib/core/note_serializer.dart
+++ b/lib/core/note_serializer.dart
@@ -1,9 +1,9 @@
-import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/settings.dart';
 import 'package:flutter_emoji/flutter_emoji.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:yaml/yaml.dart';
 
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/datetime.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';
 import 'note.dart';
 
diff --git a/lib/core/notes_cache.dart b/lib/core/notes_cache.dart
index ea441fd5..e912dcf5 100644
--- a/lib/core/notes_cache.dart
+++ b/lib/core/notes_cache.dart
@@ -2,13 +2,14 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:gitjournal/error_reporting.dart';
-import 'package:path/path.dart' as p;
+
 import 'package:collection/collection.dart';
+import 'package:path/path.dart' as p;
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class NotesCache {
diff --git a/lib/core/notes_folder_config.dart b/lib/core/notes_folder_config.dart
index 281990c4..73570100 100644
--- a/lib/core/notes_folder_config.dart
+++ b/lib/core/notes_folder_config.dart
@@ -1,5 +1,11 @@
 import 'dart:io';
 
+import 'package:equatable/equatable.dart';
+import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
+import 'package:yaml/yaml.dart';
+import 'package:yaml_serializer/yaml_serializer.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/folder_views/common.dart';
@@ -8,13 +14,6 @@ import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:meta/meta.dart';
-import 'package:path/path.dart' as p;
-
-import 'package:yaml/yaml.dart';
-import 'package:yaml_serializer/yaml_serializer.dart';
-import 'package:equatable/equatable.dart';
-
 @immutable
 class NotesFolderConfig extends Equatable {
   static const FILENAME = ".gitjournal.yaml";
diff --git a/lib/core/notes_folder_fs.dart b/lib/core/notes_folder_fs.dart
index 17063432..972c5544 100644
--- a/lib/core/notes_folder_fs.dart
+++ b/lib/core/notes_folder_fs.dart
@@ -1,14 +1,13 @@
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:gitjournal/features.dart';
-import 'package:gitjournal/utils/logger.dart';
-
+import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
 import 'package:synchronized/synchronized.dart';
-import 'package:meta/meta.dart';
 
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';
diff --git a/lib/core/notes_folder_notifier.dart b/lib/core/notes_folder_notifier.dart
index dfdcc32f..a036d15d 100644
--- a/lib/core/notes_folder_notifier.dart
+++ b/lib/core/notes_folder_notifier.dart
@@ -1,7 +1,7 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:flutter/material.dart';
 
+import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 
diff --git a/lib/core/sorted_notes_folder.dart b/lib/core/sorted_notes_folder.dart
index 90826898..88ec5c33 100644
--- a/lib/core/sorted_notes_folder.dart
+++ b/lib/core/sorted_notes_folder.dart
@@ -1,9 +1,9 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/utils/logger.dart';
-
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';
diff --git a/lib/editors/checklist_editor.dart b/lib/editors/checklist_editor.dart
index e9cac7d5..151ef465 100644
--- a/lib/editors/checklist_editor.dart
+++ b/lib/editors/checklist_editor.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:gitjournal/core/checklist.dart';
 
+import 'package:easy_localization/easy_localization.dart';
+
+import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';
diff --git a/lib/editors/common.dart b/lib/editors/common.dart
index af2cf473..f867b021 100644
--- a/lib/editors/common.dart
+++ b/lib/editors/common.dart
@@ -1,16 +1,17 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:share/share.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:share/share.dart';
-
-import 'package:image_picker/image_picker.dart';
 
 typedef NoteCallback = void Function(Note);
 
diff --git a/lib/editors/journal_editor.dart b/lib/editors/journal_editor.dart
index dc77e0e5..47f574ca 100644
--- a/lib/editors/journal_editor.dart
+++ b/lib/editors/journal_editor.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';
diff --git a/lib/editors/markdown_editor.dart b/lib/editors/markdown_editor.dart
index f1c86e47..c752eb61 100644
--- a/lib/editors/markdown_editor.dart
+++ b/lib/editors/markdown_editor.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';
diff --git a/lib/editors/raw_editor.dart b/lib/editors/raw_editor.dart
index acd73d86..5646593a 100644
--- a/lib/editors/raw_editor.dart
+++ b/lib/editors/raw_editor.dart
@@ -1,8 +1,9 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 
diff --git a/lib/error_reporting.dart b/lib/error_reporting.dart
index bbb209a2..1c68b916 100644
--- a/lib/error_reporting.dart
+++ b/lib/error_reporting.dart
@@ -1,16 +1,17 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
 import 'package:flutter/foundation.dart';
+
+import 'package:device_info/device_info.dart';
 import 'package:flutter_crashlytics/flutter_crashlytics.dart';
-import 'package:gitjournal/app.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:package_info/package_info.dart';
 import 'package:sentry/sentry.dart';
 
 import 'package:gitjournal/.env.dart';
+import 'package:gitjournal/app.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 SentryClient _sentryClient;
 Future<SentryClient> _initSentry() async {
diff --git a/lib/folder_views/card_view.dart b/lib/folder_views/card_view.dart
index 1e2ba454..d8a479f9 100644
--- a/lib/folder_views/card_view.dart
+++ b/lib/folder_views/card_view.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/note_tile.dart';
 
diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart
index c9043408..393bcae0 100644
--- a/lib/folder_views/common.dart
+++ b/lib/folder_views/common.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/card_view.dart';
@@ -9,8 +11,6 @@ import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-
 import 'standard_view.dart';
 
 enum FolderViewType {
diff --git a/lib/folder_views/grid_view.dart b/lib/folder_views/grid_view.dart
index 1fbebc09..452d33aa 100644
--- a/lib/folder_views/grid_view.dart
+++ b/lib/folder_views/grid_view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/card_view.dart';
 import 'package:gitjournal/folder_views/note_tile.dart';
diff --git a/lib/folder_views/journal_view.dart b/lib/folder_views/journal_view.dart
index 8de651bb..db73ab23 100644
--- a/lib/folder_views/journal_view.dart
+++ b/lib/folder_views/journal_view.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/folder_views/list_view.dart';
 
 import 'package:intl/intl.dart';
 
-import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/folder_views/list_view.dart';
 
 class JournalView extends StatelessWidget {
   final NoteSelectedFunction noteSelectedFunction;
diff --git a/lib/folder_views/note_tile.dart b/lib/folder_views/note_tile.dart
index 261c0998..1f2f34e3 100644
--- a/lib/folder_views/note_tile.dart
+++ b/lib/folder_views/note_tile.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/utils/markdown.dart';
 
diff --git a/lib/folder_views/standard_view.dart b/lib/folder_views/standard_view.dart
index 1ec57923..be6a6cbb 100644
--- a/lib/folder_views/standard_view.dart
+++ b/lib/folder_views/standard_view.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/folder_views/list_view.dart';
 
 import 'package:intl/intl.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/folder_views/list_view.dart';
 
 enum StandardViewHeader {
   TitleOrFileName,
diff --git a/lib/iap.dart b/lib/iap.dart
index 34ad0262..f8c0e09f 100644
--- a/lib/iap.dart
+++ b/lib/iap.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'dart:io' show Platform;
 
-import 'package:gitjournal/app.dart';
-import 'package:gitjournal/utils/logger.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:http/http.dart' as http;
+import 'package:in_app_purchase/in_app_purchase.dart';
 
+import 'package:gitjournal/app.dart';
 import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class InAppPurchases {
   static Future<void> confirmProPurchaseBoot() async {
diff --git a/lib/main.dart b/lib/main.dart
index ee1af7ea..153847c1 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:isolate';
 
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/material.dart';
 
-import 'package:gitjournal/error_reporting.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/app.dart';
+import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
 
 void main() async {
diff --git a/lib/screens/debug_screen.dart b/lib/screens/debug_screen.dart
index 0469ab11..50b0e20b 100644
--- a/lib/screens/debug_screen.dart
+++ b/lib/screens/debug_screen.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/screens/filesystem_screen.dart b/lib/screens/filesystem_screen.dart
index 5730ea55..7ace748b 100644
--- a/lib/screens/filesystem_screen.dart
+++ b/lib/screens/filesystem_screen.dart
@@ -1,13 +1,14 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:function_types/function_types.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/widgets/rename_dialog.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
+import 'package:gitjournal/widgets/rename_dialog.dart';
 
 class FileSystemScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index 84121c60..8c92bbf4 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -1,14 +1,14 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/folder_tree_view.dart';
 import 'package:gitjournal/widgets/rename_dialog.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-
 import 'folder_view.dart';
 
 class FolderListingScreen extends StatefulWidget {
diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index a01ff8f9..4b577c0e 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -2,24 +2,23 @@ import 'package:flutter/material.dart';
 
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:git_bindings/git_bindings.dart';
+import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorted_notes_folder.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
+import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/note_search_delegate.dart';
 import 'package:gitjournal/widgets/sync_button.dart';
-import 'package:gitjournal/folder_views/common.dart';
-
-import 'package:provider/provider.dart';
 
 enum DropDownChoices {
   SortingOptions,
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index c70078f3..0c849a0e 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
+
+import 'package:intl/date_symbol_data_local.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder.dart';
-import 'package:provider/provider.dart';
-import 'package:intl/date_symbol_data_local.dart';
-
 import 'package:gitjournal/core/notes_folder_fs.dart';
-
 import 'folder_view.dart';
 
 class HomeScreen extends StatefulWidget {
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index a1debd5d..52051722 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -1,17 +1,19 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';
 
-import 'package:gitjournal/core/note.dart';
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/editors/checklist_editor.dart';
 import 'package:gitjournal/editors/journal_editor.dart';
 import 'package:gitjournal/editors/markdown_editor.dart';
 import 'package:gitjournal/editors/raw_editor.dart';
-import 'package:gitjournal/editors/checklist_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
@@ -20,7 +22,6 @@ import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/note_editor_selector.dart';
 import 'package:gitjournal/widgets/note_tag_editor.dart';
 import 'package:gitjournal/widgets/rename_dialog.dart';
-import 'package:provider/provider.dart';
 
 class ShowUndoSnackbar {}
 
diff --git a/lib/screens/onboarding_screens.dart b/lib/screens/onboarding_screens.dart
index a6934fb8..8429f70b 100644
--- a/lib/screens/onboarding_screens.dart
+++ b/lib/screens/onboarding_screens.dart
@@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:dots_indicator/dots_indicator.dart';
-import 'package:flutter/material.dart';
 import 'package:function_types/function_types.dart';
 
 class OnBoardingScreen extends StatefulWidget {
diff --git a/lib/screens/settings_editors.dart b/lib/screens/settings_editors.dart
index a8a59a1b..4ae14a0d 100644
--- a/lib/screens/settings_editors.dart
+++ b/lib/screens/settings_editors.dart
@@ -1,9 +1,11 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+
+import 'package:easy_localization/easy_localization.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
diff --git a/lib/screens/settings_experimental.dart b/lib/screens/settings_experimental.dart
index 931e36fb..f1214a5f 100644
--- a/lib/screens/settings_experimental.dart
+++ b/lib/screens/settings_experimental.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+
 import 'package:gitjournal/settings.dart';
 
 class ExperimentalSettingsScreen extends StatefulWidget {
diff --git a/lib/screens/settings_git_remote.dart b/lib/screens/settings_git_remote.dart
index b10ccbe2..f9fefb59 100644
--- a/lib/screens/settings_git_remote.dart
+++ b/lib/screens/settings_git_remote.dart
@@ -1,20 +1,20 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:git_bindings/git_bindings.dart';
-import 'package:gitjournal/setup/screens.dart';
-import 'package:gitjournal/setup/sshkey.dart';
+import 'package:path/path.dart' as p;
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/setup/screens.dart';
+import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-
-import 'package:path/path.dart' as p;
 
 class GitRemoteSettingsScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_images.dart b/lib/screens/settings_images.dart
index 3a8bc0ba..a582935f 100644
--- a/lib/screens/settings_images.dart
+++ b/lib/screens/settings_images.dart
@@ -1,11 +1,13 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
 
 class SettingsImagesScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_note_metadata.dart b/lib/screens/settings_note_metadata.dart
index b67f0e4e..b6f1d782 100644
--- a/lib/screens/settings_note_metadata.dart
+++ b/lib/screens/settings_note_metadata.dart
@@ -1,9 +1,11 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
+
+import 'package:gitjournal/core/md_yaml_doc_codec.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteMetadataSettingsScreen extends StatefulWidget {
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 5fec055c..9eedd597 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,23 +1,23 @@
 import 'package:flutter/material.dart';
+
+import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/screens/debug_screen.dart';
 import 'package:gitjournal/screens/settings_editors.dart';
 import 'package:gitjournal/screens/settings_experimental.dart';
+import 'package:gitjournal/screens/settings_git_remote.dart';
 import 'package:gitjournal/screens/settings_images.dart';
+import 'package:gitjournal/screens/settings_note_metadata.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/screens/settings_git_remote.dart';
-import 'package:gitjournal/screens/settings_note_metadata.dart';
-
-import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class SettingsScreen extends StatelessWidget {
   @override
diff --git a/lib/screens/tag_listing.dart b/lib/screens/tag_listing.dart
index 053a8784..68f91178 100644
--- a/lib/screens/tag_listing.dart
+++ b/lib/screens/tag_listing.dart
@@ -1,7 +1,11 @@
 import 'dart:collection';
 
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/note_serializer.dart';
@@ -10,8 +14,6 @@ import 'package:gitjournal/screens/folder_view.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class TagListingScreen extends StatelessWidget {
   @override
diff --git a/lib/settings.dart b/lib/settings.dart
index c63b7384..4f5f5d26 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -1,9 +1,9 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:uuid/uuid.dart';
+
+import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/screens/note_editor.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:gitjournal/core/sorting_mode.dart';
-
-import 'package:uuid/uuid.dart';
 
 class Settings {
   static List<Function> changeObservers = [];
diff --git a/lib/setup/autoconfigure.dart b/lib/setup/autoconfigure.dart
index b35fda55..eaf71939 100644
--- a/lib/setup/autoconfigure.dart
+++ b/lib/setup/autoconfigure.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:function_types/function_types.dart';
 
 import 'package:gitjournal/analytics.dart';
@@ -7,7 +8,6 @@ import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
-
 import 'button.dart';
 import 'error.dart';
 import 'loading.dart';
diff --git a/lib/setup/button.dart b/lib/setup/button.dart
index c4c3085a..d53bc973 100644
--- a/lib/setup/button.dart
+++ b/lib/setup/button.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
+
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/setup/clone_url.dart b/lib/setup/clone_url.dart
index 4819fa3b..30b31b38 100644
--- a/lib/setup/clone_url.dart
+++ b/lib/setup/clone_url.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:git_url_parse2/git_url_parse2.dart';
-import 'package:function_types/function_types.dart';
-import 'package:gitjournal/apis/githost_factory.dart';
 
+import 'package:function_types/function_types.dart';
+import 'package:git_url_parse2/git_url_parse2.dart';
+
+import 'package:gitjournal/apis/githost_factory.dart';
 import 'button.dart';
 
 class GitCloneUrlPage extends StatefulWidget {
diff --git a/lib/setup/repo_selector.dart b/lib/setup/repo_selector.dart
index 8b64aa3f..93f5eda8 100644
--- a/lib/setup/repo_selector.dart
+++ b/lib/setup/repo_selector.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
+import 'package:intl/intl.dart';
 
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:intl/intl.dart';
-
 import 'button.dart';
 import 'error.dart';
 import 'loading.dart';
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index c8cfc796..f317ba06 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -1,25 +1,23 @@
 import 'dart:io';
 
-import 'package:dots_indicator/dots_indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:dots_indicator/dots_indicator.dart';
 import 'package:function_types/function_types.dart';
 import 'package:git_bindings/git_bindings.dart';
-
-import 'package:gitjournal/analytics.dart';
-import 'package:gitjournal/apis/githost_factory.dart';
-import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/setup/repo_selector.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
-
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/githost_factory.dart';
+import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/setup/repo_selector.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'autoconfigure.dart';
 import 'button.dart';
 import 'clone_url.dart';
diff --git a/lib/setup/sshkey.dart b/lib/setup/sshkey.dart
index 779cce31..42aea7ef 100644
--- a/lib/setup/sshkey.dart
+++ b/lib/setup/sshkey.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
 
 import 'button.dart';
diff --git a/lib/ssh/keygen.dart b/lib/ssh/keygen.dart
index 95d23c12..8b5921dc 100644
--- a/lib/ssh/keygen.dart
+++ b/lib/ssh/keygen.dart
@@ -1,9 +1,9 @@
 import 'package:git_bindings/git_bindings.dart';
+import 'package:meta/meta.dart';
+
 import 'package:gitjournal/ssh/rsa_key_pair.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:meta/meta.dart';
-
 Future<String> generateSSHKeys({@required String comment}) async {
   try {
     var keyPair = await RsaKeyPair.generateAsync();
diff --git a/lib/ssh/main_keygen.dart b/lib/ssh/main_keygen.dart
index caf7de00..f6f3c300 100644
--- a/lib/ssh/main_keygen.dart
+++ b/lib/ssh/main_keygen.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:gitjournal/ssh/rsa_key_pair.dart';
 
 void main() {
diff --git a/lib/ssh/rsa_key_pair.dart b/lib/ssh/rsa_key_pair.dart
index 52611184..d6120ec7 100644
--- a/lib/ssh/rsa_key_pair.dart
+++ b/lib/ssh/rsa_key_pair.dart
@@ -3,17 +3,17 @@ import 'dart:convert';
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/ssh/binary_length_value.dart';
-import 'package:gitjournal/utils/logger.dart';
+import 'package:isolate/isolate_runner.dart';
+import 'package:meta/meta.dart';
+import 'package:ssh_key/ssh_key.dart' as ssh_key;
 import 'package:steel_crypt/PointyCastleN/key_generators/rsa_key_generator.dart';
 import 'package:steel_crypt/PointyCastleN/pointycastle.dart';
 import 'package:steel_crypt/PointyCastleN/random/fortuna_random.dart';
 import 'package:steel_crypt/steel_crypt.dart';
-import 'package:meta/meta.dart';
 
-import 'package:ssh_key/ssh_key.dart' as ssh_key;
-import 'package:isolate/isolate_runner.dart';
+import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/ssh/binary_length_value.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class RsaKeyPair {
   RSAPublicKey publicKey;
diff --git a/lib/state_container.dart b/lib/state_container.dart
index c2fab299..21dd0b50 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -3,24 +3,24 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/analytics.dart';
-
-import 'package:gitjournal/apis/git_migration.dart';
-import 'package:gitjournal/appstate.dart';
-import 'package:gitjournal/core/note.dart';
-import 'package:gitjournal/core/notes_cache.dart';
-import 'package:gitjournal/core/notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/git_repo.dart';
-import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/features.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/git_migration.dart';
+import 'package:gitjournal/appstate.dart';
+import 'package:gitjournal/core/git_repo.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_cache.dart';
+import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
+
 class StateContainer with ChangeNotifier {
   final AppState appState;
 
diff --git a/lib/utils.dart b/lib/utils.dart
index fbe49873..57d19071 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
+
+import 'package:package_info/package_info.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:package_info/package_info.dart';
-
 import 'app.dart';
 import 'core/note.dart';
 import 'state_container.dart';
diff --git a/lib/utils/datetime.dart b/lib/utils/datetime.dart
index b30d3ceb..1e9cb2c6 100644
--- a/lib/utils/datetime.dart
+++ b/lib/utils/datetime.dart
@@ -1,7 +1,9 @@
 import 'dart:core';
-import 'package:gitjournal/utils/logger.dart';
+
 import 'package:intl/intl.dart';
 
+import 'package:gitjournal/utils/logger.dart';
+
 final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss");
 final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss");
 
diff --git a/lib/utils/logger.dart b/lib/utils/logger.dart
index a6125cd5..7bf53828 100644
--- a/lib/utils/logger.dart
+++ b/lib/utils/logger.dart
@@ -1,11 +1,12 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart' as foundation;
+
 import 'package:fimber/fimber.dart';
 import 'package:meta/meta.dart';
-import 'package:flutter/foundation.dart' as foundation;
-import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 
 class Log {
   static String logFolderPath;
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index eccb8cdd..7c9f4741 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -1,19 +1,20 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+
 import 'package:flutter_email_sender/flutter_email_sender.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:gitjournal/features.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:launch_review/launch_review.dart';
 import 'package:provider/provider.dart';
 import 'package:share/share.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class AppDrawer extends StatelessWidget {
   @override
diff --git a/lib/widgets/folder_selection_dialog.dart b/lib/widgets/folder_selection_dialog.dart
index 8b0fba7b..fe568173 100644
--- a/lib/widgets/folder_selection_dialog.dart
+++ b/lib/widgets/folder_selection_dialog.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
diff --git a/lib/widgets/journal_editor_header.dart b/lib/widgets/journal_editor_header.dart
index 9db8299d..1e43fca9 100644
--- a/lib/widgets/journal_editor_header.dart
+++ b/lib/widgets/journal_editor_header.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:intl/intl.dart';
+
 import 'package:gitjournal/core/note.dart';
 
 class JournalEditorHeader extends StatelessWidget {
diff --git a/lib/widgets/katex_widget.dart b/lib/widgets/katex_widget.dart
index dc254104..5aaa0e11 100644
--- a/lib/widgets/katex_widget.dart
+++ b/lib/widgets/katex_widget.dart
@@ -4,10 +4,10 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
-import 'package:path/path.dart' as p;
-import 'package:mutex/mutex.dart';
 import 'package:crypto/crypto.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
+import 'package:mutex/mutex.dart';
+import 'package:path/path.dart' as p;
 
 class KatexWidget extends StatefulWidget {
   final String input;
diff --git a/lib/widgets/note_editor_selector.dart b/lib/widgets/note_editor_selector.dart
index 83c0961a..615d897c 100644
--- a/lib/widgets/note_editor_selector.dart
+++ b/lib/widgets/note_editor_selector.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+
 import 'package:font_awesome_flutter/fa_icon.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 
diff --git a/lib/widgets/note_search_delegate.dart b/lib/widgets/note_search_delegate.dart
index 0596cf04..2f644aa5 100644
--- a/lib/widgets/note_search_delegate.dart
+++ b/lib/widgets/note_search_delegate.dart
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/virtual_notes_folder.dart';
+import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/themes.dart';
 
-import 'package:gitjournal/folder_views/common.dart';
-
 class NoteSearchDelegate extends SearchDelegate<Note> {
   final List<Note> notes;
   final FolderViewType viewType;
diff --git a/lib/widgets/note_tag_editor.dart b/lib/widgets/note_tag_editor.dart
index acb3e5ec..1b2b2814 100644
--- a/lib/widgets/note_tag_editor.dart
+++ b/lib/widgets/note_tag_editor.dart
@@ -1,5 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class NoteTagEditor extends StatefulWidget {
diff --git a/lib/widgets/note_viewer.dart b/lib/widgets/note_viewer.dart
index 1043efb1..50a5457f 100644
--- a/lib/widgets/note_viewer.dart
+++ b/lib/widgets/note_viewer.dart
@@ -1,11 +1,14 @@
 import 'dart:io';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
+import 'package:path/path.dart' as p;
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
@@ -16,10 +19,6 @@ import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/notes_backlinks.dart';
 
-import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:path/path.dart' as p;
-
 class NoteViewer extends StatelessWidget {
   final Note note;
   const NoteViewer({Key key, @required this.note}) : super(key: key);
diff --git a/lib/widgets/notes_backlinks.dart b/lib/widgets/notes_backlinks.dart
index 6b1561cc..9f5ff226 100644
--- a/lib/widgets/notes_backlinks.dart
+++ b/lib/widgets/notes_backlinks.dart
@@ -1,15 +1,15 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/core/link.dart';
-import 'package:gitjournal/utils/logger.dart';
-import 'package:gitjournal/widgets/pro_overlay.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
 
-import 'package:gitjournal/folder_views/common.dart';
-
+import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/folder_views/common.dart';
+import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteBacklinkRenderer extends StatefulWidget {
   final Note note;
diff --git a/lib/widgets/pro_overlay.dart b/lib/widgets/pro_overlay.dart
index 9b9d9fb8..f15c9567 100644
--- a/lib/widgets/pro_overlay.dart
+++ b/lib/widgets/pro_overlay.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
 
 import 'package:gitjournal/settings.dart';
diff --git a/lib/widgets/purchase_slider.dart b/lib/widgets/purchase_slider.dart
index 523ed373..ec1d68d3 100644
--- a/lib/widgets/purchase_slider.dart
+++ b/lib/widgets/purchase_slider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:equatable/equatable.dart';
 
 class PaymentInfo extends Equatable {
diff --git a/lib/widgets/purchase_widget.dart b/lib/widgets/purchase_widget.dart
index 4cddd25c..7e6ab154 100644
--- a/lib/widgets/purchase_widget.dart
+++ b/lib/widgets/purchase_widget.dart
@@ -3,16 +3,16 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+
 import 'package:gitjournal/.env.dart';
+import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/purchase_slider.dart';
 
-import 'package:purchases_flutter/purchases_flutter.dart';
-
 class PurchaseButton extends StatelessWidget {
   final Package package;
 
diff --git a/lib/widgets/rename_dialog.dart b/lib/widgets/rename_dialog.dart
index 787c15fd..37d759fc 100644
--- a/lib/widgets/rename_dialog.dart
+++ b/lib/widgets/rename_dialog.dart
@@ -1,9 +1,10 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:path/path.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
+import 'package:path/path.dart';
 
 class RenameDialog extends StatefulWidget {
   final String oldPath;
diff --git a/lib/widgets/sync_button.dart b/lib/widgets/sync_button.dart
index aa221392..b9afd7cb 100644
--- a/lib/widgets/sync_button.dart
+++ b/lib/widgets/sync_button.dart
@@ -1,14 +1,15 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+
+import 'package:badges/badges.dart';
 import 'package:connectivity/connectivity.dart';
 import 'package:git_bindings/git_bindings.dart';
-import 'package:badges/badges.dart';
+import 'package:provider/provider.dart';
 
 import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:provider/provider.dart';
 
 class SyncButton extends StatefulWidget {
   @override
diff --git a/pubspec.lock b/pubspec.lock
index 9bad0a4a..bad051a9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -106,6 +106,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.12"
+  colorize:
+    dependency: transitive
+    description:
+      name: colorize
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   connectivity:
     dependency: "direct main"
     description:
@@ -411,6 +418,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  import_sorter:
+    dependency: "direct dev"
+    description:
+      name: import_sorter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.2.1"
   in_app_purchase:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 9fd6c252..5221f87a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -63,6 +63,7 @@ dev_dependencies:
   flutter_launcher_icons: "^0.7.2"
   screenshots: ^2.1.1
   test: ^1.5.1
+  import_sorter: ^4.2.1
   flutter_test:
     sdk: flutter
   flutter_driver:
diff --git a/test/checklist_test.dart b/test/checklist_test.dart
index d471f4ee..ac65e6ed 100644
--- a/test/checklist_test.dart
+++ b/test/checklist_test.dart
@@ -1,10 +1,11 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Note', () {
diff --git a/test/datetime_utils_test.dart b/test/datetime_utils_test.dart
index 1f0d850a..0901f18a 100644
--- a/test/datetime_utils_test.dart
+++ b/test/datetime_utils_test.dart
@@ -1,6 +1,7 @@
-import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/utils/datetime.dart';
+
 void main() {
   group('DateTime Utils', () {
     test('Test random date', () {
diff --git a/test/editor_heuristics_test.dart b/test/editor_heuristics_test.dart
index a56f881b..d993d60a 100644
--- a/test/editor_heuristics_test.dart
+++ b/test/editor_heuristics_test.dart
@@ -1,4 +1,5 @@
 import 'package:test/test.dart';
+
 import 'package:gitjournal/editors/heuristics.dart';
 
 void main() {
diff --git a/test/flattened_notes_folder_large_test.dart b/test/flattened_notes_folder_large_test.dart
index e93c6616..28c7abe6 100644
--- a/test/flattened_notes_folder_large_test.dart
+++ b/test/flattened_notes_folder_large_test.dart
@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:gitjournal/core/flattened_notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/flattened_notes_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+
 void main() {
   group('Flattened Notes Folder Large Test', () {
     Directory tempDir;
diff --git a/test/flattened_notes_folder_test.dart b/test/flattened_notes_folder_test.dart
index 6e388c4f..5a7eb80c 100644
--- a/test/flattened_notes_folder_test.dart
+++ b/test/flattened_notes_folder_test.dart
@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:gitjournal/core/flattened_notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/flattened_notes_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+
 void main() {
   group('Flattened Notes Folder Test', () {
     Directory tempDir;
diff --git a/test/links_loader_test.dart b/test/links_loader_test.dart
index 46903ab5..70a6661d 100644
--- a/test/links_loader_test.dart
+++ b/test/links_loader_test.dart
@@ -1,6 +1,7 @@
-import 'package:gitjournal/core/links_loader.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/links_loader.dart';
+
 void main() {
   group('LinksLoader', () {
     var contents = """[[GitJournal]]
diff --git a/test/md_yaml_codec_test.dart b/test/md_yaml_codec_test.dart
index b9109a4e..64c91cb6 100644
--- a/test/md_yaml_codec_test.dart
+++ b/test/md_yaml_codec_test.dart
@@ -1,9 +1,10 @@
 import 'dart:collection';
 
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/utils/datetime.dart';
-import 'package:test/test.dart';
 
 DateTime nowWithoutMicro() {
   var dt = DateTime.now();
diff --git a/test/md_yaml_doc_loader_test.dart b/test/md_yaml_doc_loader_test.dart
index 9ab50dd6..f8b32173 100644
--- a/test/md_yaml_doc_loader_test.dart
+++ b/test/md_yaml_doc_loader_test.dart
@@ -1,9 +1,10 @@
 import 'dart:io';
 
-import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc_loader.dart';
+
 void main() {
   group('MdYamlDocLoader', () {
     Directory tempDir;
diff --git a/test/md_yaml_doc_test.dart b/test/md_yaml_doc_test.dart
index 56432b7e..09206ce7 100644
--- a/test/md_yaml_doc_test.dart
+++ b/test/md_yaml_doc_test.dart
@@ -1,8 +1,9 @@
 import 'dart:collection';
 
-import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc.dart';
+
 void main() {
   test('Equality', () {
     // ignore: prefer_collection_literals
diff --git a/test/merge_conflcts_resolver_test.dart b/test/merge_conflcts_resolver_test.dart
index 5fae17ef..400e597d 100644
--- a/test/merge_conflcts_resolver_test.dart
+++ b/test/merge_conflcts_resolver_test.dart
@@ -1,4 +1,5 @@
 import 'package:test/test.dart';
+
 import 'package:gitjournal/utils/merge_conflict_resolver.dart';
 
 void main() {
diff --git a/test/note_serializer_test.dart b/test/note_serializer_test.dart
index 17cff0b8..74410748 100644
--- a/test/note_serializer_test.dart
+++ b/test/note_serializer_test.dart
@@ -1,8 +1,9 @@
 import 'dart:collection';
 
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
-import 'package:test/test.dart';
 import 'package:gitjournal/core/note_serializer.dart';
 
 void main() {
diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart
index 6712e2a3..d25d3ff8 100644
--- a/test/note_storage_test.dart
+++ b/test/note_storage_test.dart
@@ -1,12 +1,13 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/core/note.dart';
-import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
+
 void main() {
   group('NoteStorage', () {
     var notes = <Note>[];
diff --git a/test/note_test.dart b/test/note_test.dart
index 4398140a..fa0e3c6d 100644
--- a/test/note_test.dart
+++ b/test/note_test.dart
@@ -1,9 +1,10 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Note', () {
diff --git a/test/notes_cache_test.dart b/test/notes_cache_test.dart
index 1fed9169..e132b58b 100644
--- a/test/notes_cache_test.dart
+++ b/test/notes_cache_test.dart
@@ -1,9 +1,10 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/notes_cache.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Notes Cache', () {
diff --git a/test/notes_folder_config_test.dart b/test/notes_folder_config_test.dart
index 70c48d55..55907f82 100644
--- a/test/notes_folder_config_test.dart
+++ b/test/notes_folder_config_test.dart
@@ -1,5 +1,8 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/notes_folder_config.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
@@ -7,8 +10,6 @@ import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Notes Folder Config', () {
diff --git a/test/sorted_notes_folder_test.dart b/test/sorted_notes_folder_test.dart
index 4e647e1c..a4da22ed 100644
--- a/test/sorted_notes_folder_test.dart
+++ b/test/sorted_notes_folder_test.dart
@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorted_notes_folder.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/core/note.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Sorted Notes Folder Test', () {
diff --git a/test/sorting_mode_test.dart b/test/sorting_mode_test.dart
index 59d872e2..6ded98d3 100644
--- a/test/sorting_mode_test.dart
+++ b/test/sorting_mode_test.dart
@@ -1,7 +1,8 @@
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('Sorting Mode', () {
diff --git a/test/strip_markdown_formatting_test.dart b/test/strip_markdown_formatting_test.dart
index cff4e737..6a679342 100644
--- a/test/strip_markdown_formatting_test.dart
+++ b/test/strip_markdown_formatting_test.dart
@@ -1,6 +1,7 @@
-import 'package:gitjournal/utils/markdown.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/utils/markdown.dart';
+
 void main() {
   group('Markdown Remove Formatting', () {
     test('Test Headers', () {