diff --git a/lib/app.dart b/lib/app.dart
index 8fecfb5b..c620e6d0 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -23,8 +23,8 @@ import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
 import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
 import 'package:gitjournal/themes.dart';
 import 'package:gitjournal/utils/logger.dart';
 
@@ -397,7 +397,7 @@ class GitJournalChangeNotifiers extends StatelessWidget {
   Widget buildMarkdownSettings({required Widget child}) {
     return Consumer<RepositoryManager>(
       builder: (_, repoManager, __) {
-        var markdown = MarkdownRendererSettings(repoManager.currentId);
+        var markdown = MarkdownRendererConfig(repoManager.currentId);
         markdown.load(pref);
 
         return ChangeNotifierProvider.value(value: markdown, child: child);
diff --git a/lib/settings/settings_markdown_renderer.dart b/lib/settings/markdown_renderer_config.dart
similarity index 98%
rename from lib/settings/settings_markdown_renderer.dart
rename to lib/settings/markdown_renderer_config.dart
index 3f9c38a5..f18851f3 100644
--- a/lib/settings/settings_markdown_renderer.dart
+++ b/lib/settings/markdown_renderer_config.dart
@@ -22,8 +22,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/settings/settings_sharedpref.dart';
 
-class MarkdownRendererSettings extends ChangeNotifier with SettingsSharedPref {
-  MarkdownRendererSettings(this.id);
+class MarkdownRendererConfig extends ChangeNotifier with SettingsSharedPref {
+  MarkdownRendererConfig(this.id);
 
   @override
   final String id;
@@ -88,7 +88,7 @@ class MarkdownRendererSettings extends ChangeNotifier with SettingsSharedPref {
 
   Future<void> save() async {
     var pref = await SharedPreferences.getInstance();
-    var defaultSet = MarkdownRendererSettings(id);
+    var defaultSet = MarkdownRendererConfig(id);
 
     // Display - Image
     await setBool(pref, "rotateImageGestures", rotateImageGestures,
diff --git a/lib/settings/settings_display_images.dart b/lib/settings/settings_display_images.dart
index 5e65483b..2c81a7e5 100644
--- a/lib/settings/settings_display_images.dart
+++ b/lib/settings/settings_display_images.dart
@@ -21,9 +21,9 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/settings/settings_display_images_caption.dart';
 import 'package:gitjournal/settings/settings_display_images_theming.dart';
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
 import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsDisplayImagesScreen extends StatefulWidget {
@@ -36,7 +36,7 @@ class SettingsDisplayImagesScreenState
     extends State<SettingsDisplayImagesScreen> {
   @override
   Widget build(BuildContext context) {
-    final settings = Provider.of<MarkdownRendererSettings>(context);
+    final settings = Provider.of<MarkdownRendererConfig>(context);
     final theme = Theme.of(context);
 
     final body = ListView(children: <Widget>[
diff --git a/lib/settings/settings_display_images_caption.dart b/lib/settings/settings_display_images_caption.dart
index 7c2a6634..f083ef5d 100644
--- a/lib/settings/settings_display_images_caption.dart
+++ b/lib/settings/settings_display_images_caption.dart
@@ -19,8 +19,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
 import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/settings/settings_widgets.dart';
 
@@ -36,7 +36,7 @@ class SettingsDisplayImagesCaptionScreenState
   final doCaptionTagsKey = GlobalKey<FormFieldState<String>>();
   @override
   Widget build(BuildContext context) {
-    var settings = Provider.of<MarkdownRendererSettings>(context);
+    var settings = Provider.of<MarkdownRendererConfig>(context);
     var saveDoNotCaptionTag = (String? doNotCaptionTags) {
       if (doNotCaptionTags == null) {
         return;
diff --git a/lib/settings/settings_display_images_theming.dart b/lib/settings/settings_display_images_theming.dart
index a09e9020..cbd9b659 100644
--- a/lib/settings/settings_display_images_theming.dart
+++ b/lib/settings/settings_display_images_theming.dart
@@ -19,8 +19,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
 import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/settings/settings_widgets.dart';
 
@@ -37,7 +37,7 @@ class SettingsDisplayImagesThemingScreenState
 
   @override
   Widget build(BuildContext context) {
-    var settings = Provider.of<MarkdownRendererSettings>(context);
+    var settings = Provider.of<MarkdownRendererConfig>(context);
 
     var saveDoNotThemeTag = (String? doNotThemeTags) {
       settings.doNotThemeTags = parseTags(doNotThemeTags!);
diff --git a/lib/widgets/images/image_caption.dart b/lib/widgets/images/image_caption.dart
index 2f0eaf05..45a2caac 100644
--- a/lib/widgets/images/image_caption.dart
+++ b/lib/widgets/images/image_caption.dart
@@ -21,7 +21,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/utils/hero_dialog.dart';
 
 class ImageCaption extends StatelessWidget {
@@ -33,7 +33,7 @@ class ImageCaption extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final settings = Provider.of<MarkdownRendererSettings>(context);
+    final settings = Provider.of<MarkdownRendererConfig>(context);
 
     final text = captionText(context, altText, tooltip);
 
@@ -116,7 +116,7 @@ bool shouldCaption(BuildContext context, String altText, String tooltip) {
 }
 
 String captionText(BuildContext context, String altText, String tooltip) {
-  final settings = Provider.of<MarkdownRendererSettings>(context);
+  final settings = Provider.of<MarkdownRendererConfig>(context);
 
   bool altTextCaption =
       settings.useAsCaption == SettingsImageTextType.AltTool ||
@@ -152,7 +152,7 @@ String captionText(BuildContext context, String altText, String tooltip) {
 }
 
 String _cleanCaption(BuildContext context, String caption) {
-  final settings = Provider.of<MarkdownRendererSettings>(context);
+  final settings = Provider.of<MarkdownRendererConfig>(context);
   final tags = [
     ...settings.doThemeTags,
     ...settings.doNotThemeTags,
@@ -171,7 +171,7 @@ String _cleanCaption(BuildContext context, String caption) {
 }
 
 Color _overlayBackgroundColor(context) {
-  final settings = Provider.of<MarkdownRendererSettings>(context);
+  final settings = Provider.of<MarkdownRendererConfig>(context);
   final theme = Theme.of(context);
   return settings.transparentCaption
       ? (theme.brightness == Brightness.dark ? Colors.black : Colors.white)
diff --git a/lib/widgets/images/image_details.dart b/lib/widgets/images/image_details.dart
index a25fb90f..b9fcfd34 100644
--- a/lib/widgets/images/image_details.dart
+++ b/lib/widgets/images/image_details.dart
@@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/widgets/images/markdown_image.dart';
 import 'package:gitjournal/widgets/images/themable_image.dart';
 
@@ -38,7 +38,7 @@ class _ImageDetailsState extends State<ImageDetails> {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final settings = Provider.of<MarkdownRendererSettings>(context);
+    final settings = Provider.of<MarkdownRendererConfig>(context);
     final bg =
         theme.brightness == Brightness.dark ? Colors.black : Colors.white;
     final overlayColor = getOverlayBackgroundColor(context,
diff --git a/lib/widgets/images/markdown_image.dart b/lib/widgets/images/markdown_image.dart
index 56f8b348..01d8d222 100644
--- a/lib/widgets/images/markdown_image.dart
+++ b/lib/widgets/images/markdown_image.dart
@@ -26,7 +26,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings/settings_markdown_renderer.dart';
+import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/images/image_caption.dart';
 import 'package:gitjournal/widgets/images/image_details.dart';
@@ -61,7 +61,7 @@ class MarkdownImage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final settings = Provider.of<MarkdownRendererSettings>(context);
+    final settings = Provider.of<MarkdownRendererConfig>(context);
     final theme = Theme.of(context);
     final dark = theme.brightness == Brightness.dark;
 
@@ -217,7 +217,7 @@ class MarkdownImage extends StatelessWidget {
 
 Color getOverlayBackgroundColor(BuildContext context,
     {Color? light, Color? dark}) {
-  final settings = Provider.of<MarkdownRendererSettings>(context);
+  final settings = Provider.of<MarkdownRendererConfig>(context);
   final theme = Theme.of(context);
   return theme.brightness == Brightness.dark
       ? settings.transparentCaption