diff --git a/YACReader/themes/builtin_classic.json b/YACReader/themes/builtin_classic.json
index 74dff6b4..f3edf088 100644
--- a/YACReader/themes/builtin_classic.json
+++ b/YACReader/themes/builtin_classic.json
@@ -1,17 +1,37 @@
 {
+    "goToFlowWidget": {
+        "editBackgroundColor": "#55000000",
+        "editBorderColor": "#77000000",
+        "editTextColor": "#ffffff",
+        "flowBackgroundColor": "#282828",
+        "flowTextColor": "#ffffff",
+        "iconColor": "#ffffff",
+        "labelTextColor": "#ffffff",
+        "sliderBorderColor": "#22ffffff",
+        "sliderGrooveColor": "#77000000",
+        "sliderHandleColor": "#55ffffff",
+        "toolbarBackgroundColor": "#99000000"
+    },
+    "helpAboutDialog": {
+        "headingColor": "#302f2d",
+        "linkColor": "#c19441"
+    },
     "meta": {
-        "id": "builtin/classic",
         "displayName": "Default Classic",
+        "id": "builtin/classic",
         "variant": "dark"
     },
+    "shortcutsIcons": {
+        "iconColor": "#404040"
+    },
     "toolbar": {
+        "backgroundColor": "#f3f3f3",
+        "checkedButtonColor": "#cccccc",
+        "iconCheckedColor": "#5a5a5a",
         "iconColor": "#404040",
         "iconDisabledColor": "#858585",
-        "iconCheckedColor": "#5a5a5a",
-        "backgroundColor": "#f3f3f3",
-        "separatorColor": "#cccccc",
-        "checkedButtonColor": "#cccccc",
-        "menuIndicatorColor": "#404040"
+        "menuIndicatorColor": "#404040",
+        "separatorColor": "#cccccc"
     },
     "viewer": {
         "defaultBackgroundColor": "#282828",
@@ -19,33 +39,13 @@
         "infoBackgroundColor": "#bb000000",
         "infoTextColor": "#ffffff"
     },
-    "goToFlowWidget": {
-        "flowBackgroundColor": "#282828",
-        "flowTextColor": "#ffffff",
-        "toolbarBackgroundColor": "#99000000",
-        "sliderBorderColor": "#22ffffff",
-        "sliderGrooveColor": "#77000000",
-        "sliderHandleColor": "#55ffffff",
-        "editBorderColor": "#77000000",
-        "editBackgroundColor": "#55000000",
-        "editTextColor": "#ffffff",
-        "labelTextColor": "#ffffff",
-        "iconColor": "#ffffff"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#302f2d",
-        "linkColor": "#c19441"
-    },
     "whatsNewDialog": {
         "backgroundColor": "#ffffff",
-        "headerTextColor": "#0a0a0a",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#0a0a0a",
-        "linkColor": "#e8b800",
         "closeButtonColor": "#444444",
-        "headerDecorationColor": "#e8b800"
-    },
-    "shortcutsIcons": {
-        "iconColor": "#404040"
+        "contentTextColor": "#0a0a0a",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#0a0a0a",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }
diff --git a/YACReader/themes/builtin_dark.json b/YACReader/themes/builtin_dark.json
index 01085ca9..61038dfa 100644
--- a/YACReader/themes/builtin_dark.json
+++ b/YACReader/themes/builtin_dark.json
@@ -1,17 +1,37 @@
 {
+    "goToFlowWidget": {
+        "editBackgroundColor": "#55000000",
+        "editBorderColor": "#77000000",
+        "editTextColor": "#ffffff",
+        "flowBackgroundColor": "#282828",
+        "flowTextColor": "#ffffff",
+        "iconColor": "#cccccc",
+        "labelTextColor": "#ffffff",
+        "sliderBorderColor": "#22ffffff",
+        "sliderGrooveColor": "#77000000",
+        "sliderHandleColor": "#55ffffff",
+        "toolbarBackgroundColor": "#99000000"
+    },
+    "helpAboutDialog": {
+        "headingColor": "#e0e0e0",
+        "linkColor": "#d4a84b"
+    },
     "meta": {
-        "id": "builtin/dark",
         "displayName": "Default Dark",
+        "id": "builtin/dark",
         "variant": "dark"
     },
+    "shortcutsIcons": {
+        "iconColor": "#d0d0d0"
+    },
     "toolbar": {
+        "backgroundColor": "#202020",
+        "checkedButtonColor": "#3a3a3a",
+        "iconCheckedColor": "#dadada",
         "iconColor": "#cccccc",
         "iconDisabledColor": "#444444",
-        "iconCheckedColor": "#dadada",
-        "backgroundColor": "#202020",
-        "separatorColor": "#444444",
-        "checkedButtonColor": "#3a3a3a",
-        "menuIndicatorColor": "#cccccc"
+        "menuIndicatorColor": "#cccccc",
+        "separatorColor": "#444444"
     },
     "viewer": {
         "defaultBackgroundColor": "#282828",
@@ -19,33 +39,13 @@
         "infoBackgroundColor": "#bb000000",
         "infoTextColor": "#b0b0b0"
     },
-    "goToFlowWidget": {
-        "flowBackgroundColor": "#282828",
-        "flowTextColor": "#ffffff",
-        "toolbarBackgroundColor": "#99000000",
-        "sliderBorderColor": "#22ffffff",
-        "sliderGrooveColor": "#77000000",
-        "sliderHandleColor": "#55ffffff",
-        "editBorderColor": "#77000000",
-        "editBackgroundColor": "#55000000",
-        "editTextColor": "#ffffff",
-        "labelTextColor": "#ffffff",
-        "iconColor": "#cccccc"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#e0e0e0",
-        "linkColor": "#d4a84b"
-    },
     "whatsNewDialog": {
         "backgroundColor": "#2a2a2a",
-        "headerTextColor": "#e0e0e0",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#e0e0e0",
-        "linkColor": "#e8b800",
         "closeButtonColor": "#dddddd",
-        "headerDecorationColor": "#e8b800"
-    },
-    "shortcutsIcons": {
-        "iconColor": "#d0d0d0"
+        "contentTextColor": "#e0e0e0",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#e0e0e0",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }
diff --git a/YACReader/themes/builtin_light.json b/YACReader/themes/builtin_light.json
index 97905791..dbd77f07 100644
--- a/YACReader/themes/builtin_light.json
+++ b/YACReader/themes/builtin_light.json
@@ -1,17 +1,37 @@
 {
+    "goToFlowWidget": {
+        "editBackgroundColor": "#22000000",
+        "editBorderColor": "#33000000",
+        "editTextColor": "#202020",
+        "flowBackgroundColor": "#f6f6f6",
+        "flowTextColor": "#202020",
+        "iconColor": "#404040",
+        "labelTextColor": "#202020",
+        "sliderBorderColor": "#22000000",
+        "sliderGrooveColor": "#33000000",
+        "sliderHandleColor": "#55000000",
+        "toolbarBackgroundColor": "#bbffffff"
+    },
+    "helpAboutDialog": {
+        "headingColor": "#302f2d",
+        "linkColor": "#c19441"
+    },
     "meta": {
-        "id": "builtin/light",
         "displayName": "Default Light",
+        "id": "builtin/light",
         "variant": "light"
     },
+    "shortcutsIcons": {
+        "iconColor": "#606060"
+    },
     "toolbar": {
+        "backgroundColor": "#f3f3f3",
+        "checkedButtonColor": "#cccccc",
+        "iconCheckedColor": "#5a5a5a",
         "iconColor": "#404040",
         "iconDisabledColor": "#b0b0b0",
-        "iconCheckedColor": "#5a5a5a",
-        "backgroundColor": "#f3f3f3",
-        "separatorColor": "#cccccc",
-        "checkedButtonColor": "#cccccc",
-        "menuIndicatorColor": "#404040"
+        "menuIndicatorColor": "#404040",
+        "separatorColor": "#cccccc"
     },
     "viewer": {
         "defaultBackgroundColor": "#f6f6f6",
@@ -19,33 +39,13 @@
         "infoBackgroundColor": "#bbffffff",
         "infoTextColor": "#404040"
     },
-    "goToFlowWidget": {
-        "flowBackgroundColor": "#f6f6f6",
-        "flowTextColor": "#202020",
-        "toolbarBackgroundColor": "#bbffffff",
-        "sliderBorderColor": "#22000000",
-        "sliderGrooveColor": "#33000000",
-        "sliderHandleColor": "#55000000",
-        "editBorderColor": "#33000000",
-        "editBackgroundColor": "#22000000",
-        "editTextColor": "#202020",
-        "labelTextColor": "#202020",
-        "iconColor": "#404040"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#302f2d",
-        "linkColor": "#c19441"
-    },
     "whatsNewDialog": {
         "backgroundColor": "#ffffff",
-        "headerTextColor": "#0a0a0a",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#0a0a0a",
-        "linkColor": "#e8b800",
         "closeButtonColor": "#444444",
-        "headerDecorationColor": "#e8b800"
-    },
-    "shortcutsIcons": {
-        "iconColor": "#606060"
+        "contentTextColor": "#0a0a0a",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#0a0a0a",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }
diff --git a/YACReaderLibrary/themes/builtin_classic.json b/YACReaderLibrary/themes/builtin_classic.json
index b410662d..ea571a11 100644
--- a/YACReaderLibrary/themes/builtin_classic.json
+++ b/YACReaderLibrary/themes/builtin_classic.json
@@ -1,237 +1,237 @@
 {
-    "meta": {
-        "id": "builtin/classic",
-        "displayName": "Default Classic",
-        "variant": "dark"
-    },
     "comicFlow": {
         "backgroundColor": "#000000",
         "textColor": "#4c4c4c"
     },
-    "metadataScraperDialog": {
-        "contentTextColor": "#ffffff",
-        "contentBackgroundColor": "#2b2b2b",
-        "contentAltBackgroundColor": "#2b2b2b",
-        "dialogBackgroundColor": "#404040",
-        "tableBackgroundColor": "#2b2b2b",
-        "tableAltBackgroundColor": "#2e2e2e",
-        "tableBorderColor": "#242424",
-        "tableSelectedColor": "#555555",
-        "tableHeaderBackgroundColor": "#292929",
-        "tableHeaderGradientColor": "#292929",
-        "tableHeaderBorderColor": "#1f1f1f",
-        "tableHeaderTextColor": "#ebebeb",
-        "tableScrollHandleColor": "#dddddd",
-        "tableScrollBackgroundColor": "#404040",
-        "tableSectionBorderLight": "#fefefe",
-        "tableSectionBorderDark": "#dfdfdf",
-        "labelTextColor": "#ffffff",
-        "labelBackgroundColor": "#2b2b2b",
-        "hyperlinkColor": "#ffcc00",
-        "buttonBackgroundColor": "#2e2e2e",
-        "buttonTextColor": "#ffffff",
-        "buttonBorderColor": "#242424",
-        "radioUncheckedColor": "#e5e5e5",
-        "radioCheckedBackgroundColor": "#e5e5e5",
-        "radioCheckedIndicatorColor": "#5f5f5f",
-        "checkBoxTickColor": "#ffffff",
-        "toolButtonAccentColor": "#282828",
-        "downArrowColor": "#9f9f9f",
-        "upArrowColor": "#9f9f9f",
-        "busyIndicatorColor": "#ffffff",
-        "navIconColor": "#ffffff",
-        "rowIconColor": "#e5e5e5"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#302f2d",
-        "linkColor": "#c19441"
-    },
-    "whatsNewDialog": {
-        "backgroundColor": "#2a2a2a",
-        "headerTextColor": "#e0e0e0",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#e0e0e0",
-        "linkColor": "#e8b800",
-        "closeButtonColor": "#dddddd",
-        "headerDecorationColor": "#e8b800"
-    },
-    "emptyContainer": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#cccccc",
-        "textColor": "#cccccc",
-        "descriptionTextColor": "#aaaaaa",
-        "searchIconColor": "#4c4c4c"
-    },
-    "sidebar": {
-        "backgroundColor": "#454545",
-        "separatorColor": "#bdbfbf",
-        "sectionSeparatorColor": "#575757",
-        "uppercaseLabels": true,
-        "titleTextColor": "#bdbfbf",
-        "titleDropShadowColor": "#000000",
-        "busyIndicatorColor": "#ffffff"
-    },
-    "sidebarIcons": {
-        "iconColor": "#e0e0e0",
-        "shadowColor": "#000000",
-        "useSystemFolderIcons": false
-    },
-    "libraryItem": {
-        "textColor": "#dddfdf",
-        "libraryIconColor": "#dddfdf",
-        "libraryIconShadowColor": "#000000",
-        "selectedTextColor": "#ffffff",
-        "selectedBackgroundColor": "#2e2e2e",
-        "libraryIconSelectedColor": "#ffffff",
-        "libraryOptionsIconColor": "#ffffff"
-    },
-    "importWidget": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#cccccc",
-        "descriptionTextColor": "#aaaaaa",
-        "currentComicTextColor": "#aaaaaa",
-        "coversViewBackgroundColor": "#3a3a3a",
-        "coversLabelColor": "#aaaaaa",
-        "coversDecorationBgColor": "#3a3a3a",
-        "coversDecorationShadowColor": "#1a1a1a",
-        "modeIconColor": "#4a4a4a",
-        "iconColor": "#cccccc",
-        "iconCheckedColor": "#aaaaaa"
-    },
-    "serverConfigDialog": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#474747",
-        "qrMessageTextColor": "#a3a3a3",
-        "propagandaTextColor": "#4d4d4d",
-        "labelTextColor": "#575757",
-        "checkBoxTextColor": "#262626",
-        "qrBackgroundColor": "#2a2a2a",
-        "qrForegroundColor": "#ffffff",
-        "decorationColor": "#f7f7f7"
-    },
-    "mainToolbar": {
-        "backgroundColor": "#f0f0f0",
-        "folderNameColor": "#404040",
-        "dividerColor": "#b8bdc4",
-        "iconColor": "#404040",
-        "iconDisabledColor": "#b0b0b0"
-    },
-    "contentSplitter": {
-        "handleColor": "#b8b8b8",
-        "horizontalHandleHeight": 4,
-        "verticalHandleWidth": 4
-    },
-    "navigationTree": {
-        "textColor": "#dddfdf",
-        "selectionBackgroundColor": "#2e2e2e",
-        "scrollBackgroundColor": "#404040",
-        "scrollHandleColor": "#dddddd",
-        "selectedTextColor": "#ffffff",
-        "folderIndicatorColor": "#edc518",
-        "branchIndicatorColor": "#e0e0e0",
-        "branchIndicatorSelectedColor": "#ffffff",
-        "folderIconColor": "#e0e0e0",
-        "folderIconShadowColor": "#000000",
-        "folderIconSelectedColor": "#e0e0e0",
-        "folderIconSelectedShadowColor": "#000000",
-        "folderReadOverlayColor": "#464646",
-        "folderReadOverlaySelectedColor": "#464646"
-    },
     "comicsViewTable": {
         "alternateBackgroundColor": "#f2f2f2",
         "backgroundColor": "#fafafa",
         "headerBackgroundColor": "#f5f5f5",
         "headerBorderColor": "#b8bdc4",
         "headerGradientColor": "#d1d1d1",
+        "headerTextColor": "#313232",
         "itemBorderBottomColor": "#dfdfdf",
-        "itemBorderTopColor": "#fefefe",
         "itemBorderBottomWidth": 1,
+        "itemBorderTopColor": "#fefefe",
         "itemBorderTopWidth": 1,
         "itemTextColor": "#252626",
         "selectedColor": "#d4d4d4",
         "selectedTextColor": "#252626",
-        "headerTextColor": "#313232",
         "starRatingColor": "#e9be0f",
         "starRatingSelectedColor": "#ffffff"
     },
-    "gridAndInfoView": {
+    "comicsViewToolbar": {
+        "backgroundColor": "#f0f0f0",
+        "checkedBackgroundColor": "#cccccc",
+        "iconColor": "#404040",
+        "separatorColor": "#cccccc"
+    },
+    "contentSplitter": {
+        "handleColor": "#b8b8b8",
+        "horizontalHandleHeight": 4,
+        "verticalHandleWidth": 4
+    },
+    "dialogIcons": {
+        "iconColor": "#f7f7f7"
+    },
+    "emptyContainer": {
         "backgroundColor": "#2a2a2a",
+        "descriptionTextColor": "#aaaaaa",
+        "searchIconColor": "#4c4c4c",
+        "textColor": "#cccccc",
+        "titleTextColor": "#cccccc"
+    },
+    "gridAndInfoView": {
+        "backgroundBlurOverlayColor": "#2a2a2a",
+        "backgroundColor": "#2a2a2a",
+        "borderColor": "#121212",
         "cellColor": "#212121",
         "cellColorWithBackground": "#99212121",
-        "selectedColor": "#121212",
-        "selectedBorderColor": "#ffcc00",
-        "borderColor": "#121212",
-        "titleColor": "#ffffff",
-        "textColor": "#a8a8a8",
-        "showDropShadow": true,
+        "continueReadingBackgroundColor": "#88000000",
+        "continueReadingColor": "#ffffff",
+        "currentComicBackgroundColor": "#88000000",
+        "favCheckedColor": "#e84852",
+        "favUncheckedColor": "#1c1c1c",
         "infoBackgroundColor": "#2e2e2e",
         "infoBorderColor": "#404040",
         "infoShadowColor": "#000000",
         "infoTextColor": "#b0b0b0",
         "infoTitleColor": "#ffffff",
-        "ratingUnselectedColor": "#1c1c1c",
         "ratingSelectedColor": "#ffffff",
-        "favUncheckedColor": "#1c1c1c",
-        "favCheckedColor": "#e84852",
-        "readTickUncheckedColor": "#1c1c1c",
+        "ratingUnselectedColor": "#1c1c1c",
         "readTickCheckedColor": "#e84852",
-        "currentComicBackgroundColor": "#88000000",
-        "continueReadingBackgroundColor": "#88000000",
-        "continueReadingColor": "#ffffff",
-        "backgroundBlurOverlayColor": "#2a2a2a"
+        "readTickUncheckedColor": "#1c1c1c",
+        "selectedBorderColor": "#ffcc00",
+        "selectedColor": "#121212",
+        "showDropShadow": true,
+        "textColor": "#a8a8a8",
+        "titleColor": "#ffffff"
     },
-    "comicsViewToolbar": {
+    "helpAboutDialog": {
+        "headingColor": "#302f2d",
+        "linkColor": "#c19441"
+    },
+    "importWidget": {
+        "backgroundColor": "#2a2a2a",
+        "coversDecorationBgColor": "#3a3a3a",
+        "coversDecorationShadowColor": "#1a1a1a",
+        "coversLabelColor": "#aaaaaa",
+        "coversViewBackgroundColor": "#3a3a3a",
+        "currentComicTextColor": "#aaaaaa",
+        "descriptionTextColor": "#aaaaaa",
+        "iconCheckedColor": "#aaaaaa",
+        "iconColor": "#cccccc",
+        "modeIconColor": "#4a4a4a",
+        "titleTextColor": "#cccccc"
+    },
+    "libraryItem": {
+        "libraryIconColor": "#dddfdf",
+        "libraryIconSelectedColor": "#ffffff",
+        "libraryIconShadowColor": "#000000",
+        "libraryOptionsIconColor": "#ffffff",
+        "selectedBackgroundColor": "#2e2e2e",
+        "selectedTextColor": "#ffffff",
+        "textColor": "#dddfdf"
+    },
+    "mainToolbar": {
         "backgroundColor": "#f0f0f0",
-        "separatorColor": "#cccccc",
-        "checkedBackgroundColor": "#cccccc",
-        "iconColor": "#404040"
-    },
-    "searchLineEdit": {
-        "textColor": "#ababab",
-        "backgroundColor": "#404040",
-        "iconColor": "#f7f7f7"
-    },
-    "readingListIcons": {
-        "labelColors": {
-            "red": "#f67a7b",
-            "orange": "#f5c240",
-            "yellow": "#f2e446",
-            "green": "#ade738",
-            "cyan": "#a0fddb",
-            "blue": "#82c7ff",
-            "violet": "#8f95ff",
-            "purple": "#d692fc",
-            "pink": "#fd9cda",
-            "white": "#fcfcfc",
-            "light": "#cbcbcb",
-            "dark": "#b7b7b7"
-        },
-        "labelShadowColor": "#000000",
-        "labelShadowSelectedColor": "#000000",
-        "readingListMainColor": "#e7e7e7",
-        "readingListMainSelectedColor": "#e7e7e7",
-        "favoritesMainColor": "#e15055",
-        "favoritesMainSelectedColor": "#e15055",
-        "currentlyReadingMainColor": "#ffcc00",
-        "currentlyReadingMainSelectedColor": "#ffcc00",
-        "currentlyReadingOuterColor": "#000000",
-        "currentlyReadingOuterSelectedColor": "#000000",
-        "specialListShadowColor": "#000000",
-        "specialListShadowSelectedColor": "#000000",
-        "listMainColor": "#e7e7e7",
-        "listMainSelectedColor": "#e7e7e7",
-        "listShadowColor": "#000000",
-        "listShadowSelectedColor": "#000000",
-        "listDetailColor": "#464646",
-        "listDetailSelectedColor": "#464646"
-    },
-    "dialogIcons": {
-        "iconColor": "#f7f7f7"
+        "dividerColor": "#b8bdc4",
+        "folderNameColor": "#404040",
+        "iconColor": "#404040",
+        "iconDisabledColor": "#b0b0b0"
     },
     "menuIcons": {
         "iconColor": "#f7f7f7"
     },
+    "meta": {
+        "displayName": "Default Classic",
+        "id": "builtin/classic",
+        "variant": "dark"
+    },
+    "metadataScraperDialog": {
+        "busyIndicatorColor": "#ffffff",
+        "buttonBackgroundColor": "#2e2e2e",
+        "buttonBorderColor": "#242424",
+        "buttonTextColor": "#ffffff",
+        "checkBoxTickColor": "#ffffff",
+        "contentAltBackgroundColor": "#2b2b2b",
+        "contentBackgroundColor": "#2b2b2b",
+        "contentTextColor": "#ffffff",
+        "dialogBackgroundColor": "#404040",
+        "downArrowColor": "#9f9f9f",
+        "hyperlinkColor": "#ffcc00",
+        "labelBackgroundColor": "#2b2b2b",
+        "labelTextColor": "#ffffff",
+        "navIconColor": "#ffffff",
+        "radioCheckedBackgroundColor": "#e5e5e5",
+        "radioCheckedIndicatorColor": "#5f5f5f",
+        "radioUncheckedColor": "#e5e5e5",
+        "rowIconColor": "#e5e5e5",
+        "tableAltBackgroundColor": "#2e2e2e",
+        "tableBackgroundColor": "#2b2b2b",
+        "tableBorderColor": "#242424",
+        "tableHeaderBackgroundColor": "#292929",
+        "tableHeaderBorderColor": "#1f1f1f",
+        "tableHeaderGradientColor": "#292929",
+        "tableHeaderTextColor": "#ebebeb",
+        "tableScrollBackgroundColor": "#404040",
+        "tableScrollHandleColor": "#dddddd",
+        "tableSectionBorderDark": "#dfdfdf",
+        "tableSectionBorderLight": "#fefefe",
+        "tableSelectedColor": "#555555",
+        "toolButtonAccentColor": "#282828",
+        "upArrowColor": "#9f9f9f"
+    },
+    "navigationTree": {
+        "branchIndicatorColor": "#e0e0e0",
+        "branchIndicatorSelectedColor": "#ffffff",
+        "folderIconColor": "#e0e0e0",
+        "folderIconSelectedColor": "#e0e0e0",
+        "folderIconSelectedShadowColor": "#000000",
+        "folderIconShadowColor": "#000000",
+        "folderIndicatorColor": "#edc518",
+        "folderReadOverlayColor": "#464646",
+        "folderReadOverlaySelectedColor": "#464646",
+        "scrollBackgroundColor": "#404040",
+        "scrollHandleColor": "#dddddd",
+        "selectedTextColor": "#ffffff",
+        "selectionBackgroundColor": "#2e2e2e",
+        "textColor": "#dddfdf"
+    },
+    "readingListIcons": {
+        "currentlyReadingMainColor": "#ffcc00",
+        "currentlyReadingMainSelectedColor": "#ffcc00",
+        "currentlyReadingOuterColor": "#000000",
+        "currentlyReadingOuterSelectedColor": "#000000",
+        "favoritesMainColor": "#e15055",
+        "favoritesMainSelectedColor": "#e15055",
+        "labelColors": {
+            "blue": "#82c7ff",
+            "cyan": "#a0fddb",
+            "dark": "#b7b7b7",
+            "green": "#ade738",
+            "light": "#cbcbcb",
+            "orange": "#f5c240",
+            "pink": "#fd9cda",
+            "purple": "#d692fc",
+            "red": "#f67a7b",
+            "violet": "#8f95ff",
+            "white": "#fcfcfc",
+            "yellow": "#f2e446"
+        },
+        "labelShadowColor": "#000000",
+        "labelShadowSelectedColor": "#000000",
+        "listDetailColor": "#464646",
+        "listDetailSelectedColor": "#464646",
+        "listMainColor": "#e7e7e7",
+        "listMainSelectedColor": "#e7e7e7",
+        "listShadowColor": "#000000",
+        "listShadowSelectedColor": "#000000",
+        "readingListMainColor": "#e7e7e7",
+        "readingListMainSelectedColor": "#e7e7e7",
+        "specialListShadowColor": "#000000",
+        "specialListShadowSelectedColor": "#000000"
+    },
+    "searchLineEdit": {
+        "backgroundColor": "#404040",
+        "iconColor": "#f7f7f7",
+        "textColor": "#ababab"
+    },
+    "serverConfigDialog": {
+        "backgroundColor": "#2a2a2a",
+        "checkBoxTextColor": "#262626",
+        "decorationColor": "#f7f7f7",
+        "labelTextColor": "#575757",
+        "propagandaTextColor": "#4d4d4d",
+        "qrBackgroundColor": "#2a2a2a",
+        "qrForegroundColor": "#ffffff",
+        "qrMessageTextColor": "#a3a3a3",
+        "titleTextColor": "#474747"
+    },
     "shortcutsIcons": {
         "iconColor": "#f7f7f7"
+    },
+    "sidebar": {
+        "backgroundColor": "#454545",
+        "busyIndicatorColor": "#ffffff",
+        "sectionSeparatorColor": "#575757",
+        "separatorColor": "#bdbfbf",
+        "titleDropShadowColor": "#000000",
+        "titleTextColor": "#bdbfbf",
+        "uppercaseLabels": true
+    },
+    "sidebarIcons": {
+        "iconColor": "#e0e0e0",
+        "shadowColor": "#000000",
+        "useSystemFolderIcons": false
+    },
+    "whatsNewDialog": {
+        "backgroundColor": "#2a2a2a",
+        "closeButtonColor": "#dddddd",
+        "contentTextColor": "#e0e0e0",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#e0e0e0",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }
diff --git a/YACReaderLibrary/themes/builtin_dark.json b/YACReaderLibrary/themes/builtin_dark.json
index 1634400a..45fbcc64 100644
--- a/YACReaderLibrary/themes/builtin_dark.json
+++ b/YACReaderLibrary/themes/builtin_dark.json
@@ -1,237 +1,237 @@
 {
-    "meta": {
-        "id": "builtin/dark",
-        "displayName": "Default Dark",
-        "variant": "dark"
-    },
     "comicFlow": {
         "backgroundColor": "#111111",
         "textColor": "#888888"
     },
-    "metadataScraperDialog": {
-        "contentTextColor": "#ffffff",
-        "contentBackgroundColor": "#2b2b2b",
-        "contentAltBackgroundColor": "#2e2e2e",
-        "dialogBackgroundColor": "#404040",
-        "tableBackgroundColor": "#2b2b2b",
-        "tableAltBackgroundColor": "#2e2e2e",
-        "tableBorderColor": "#242424",
-        "tableSelectedColor": "#555555",
-        "tableHeaderBackgroundColor": "#292929",
-        "tableHeaderGradientColor": "#292929",
-        "tableHeaderBorderColor": "#1f1f1f",
-        "tableHeaderTextColor": "#ebebeb",
-        "tableScrollHandleColor": "#dddddd",
-        "tableScrollBackgroundColor": "#404040",
-        "tableSectionBorderLight": "#fefefe",
-        "tableSectionBorderDark": "#dfdfdf",
-        "labelTextColor": "#ffffff",
-        "labelBackgroundColor": "#2b2b2b",
-        "hyperlinkColor": "#ffcc00",
-        "buttonBackgroundColor": "#2e2e2e",
-        "buttonTextColor": "#ffffff",
-        "buttonBorderColor": "#242424",
-        "radioUncheckedColor": "#e5e5e5",
-        "radioCheckedBackgroundColor": "#e5e5e5",
-        "radioCheckedIndicatorColor": "#5f5f5f",
-        "checkBoxTickColor": "#ffffff",
-        "toolButtonAccentColor": "#282828",
-        "downArrowColor": "#9f9f9f",
-        "upArrowColor": "#9f9f9f",
-        "busyIndicatorColor": "#ffffff",
-        "navIconColor": "#ffffff",
-        "rowIconColor": "#e5e5e5"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#e0e0e0",
-        "linkColor": "#d4a84b"
-    },
-    "whatsNewDialog": {
-        "backgroundColor": "#2a2a2a",
-        "headerTextColor": "#e0e0e0",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#e0e0e0",
-        "linkColor": "#e8b800",
-        "closeButtonColor": "#dddddd",
-        "headerDecorationColor": "#e8b800"
-    },
-    "emptyContainer": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#cccccc",
-        "textColor": "#cccccc",
-        "descriptionTextColor": "#aaaaaa",
-        "searchIconColor": "#4c4c4c"
-    },
-    "sidebar": {
-        "backgroundColor": "#454545",
-        "separatorColor": "#bdbfbf",
-        "sectionSeparatorColor": "#575757",
-        "uppercaseLabels": true,
-        "titleTextColor": "#bdbfbf",
-        "titleDropShadowColor": "#000000",
-        "busyIndicatorColor": "#ffffff"
-    },
-    "sidebarIcons": {
-        "iconColor": "#e0e0e0",
-        "shadowColor": "#000000",
-        "useSystemFolderIcons": false
-    },
-    "libraryItem": {
-        "textColor": "#dddfdf",
-        "libraryIconColor": "#dddfdf",
-        "libraryIconShadowColor": "#000000",
-        "selectedTextColor": "#ffffff",
-        "selectedBackgroundColor": "#2e2e2e",
-        "libraryIconSelectedColor": "#ffffff",
-        "libraryOptionsIconColor": "#ffffff"
-    },
-    "importWidget": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#cccccc",
-        "descriptionTextColor": "#aaaaaa",
-        "currentComicTextColor": "#aaaaaa",
-        "coversViewBackgroundColor": "#3a3a3a",
-        "coversLabelColor": "#aaaaaa",
-        "coversDecorationBgColor": "#3a3a3a",
-        "coversDecorationShadowColor": "#1a1a1a",
-        "modeIconColor": "#4a4a4a",
-        "iconColor": "#cccccc",
-        "iconCheckedColor": "#aaaaaa"
-    },
-    "serverConfigDialog": {
-        "backgroundColor": "#2a2a2a",
-        "titleTextColor": "#d0d0d0",
-        "qrMessageTextColor": "#a3a3a3",
-        "propagandaTextColor": "#b0b0b0",
-        "labelTextColor": "#c0c0c0",
-        "checkBoxTextColor": "#dddddd",
-        "qrBackgroundColor": "#2a2a2a",
-        "qrForegroundColor": "#ffffff",
-        "decorationColor": "#f7f7f7"
-    },
-    "mainToolbar": {
-        "backgroundColor": "#2a2a2a",
-        "folderNameColor": "#dddddd",
-        "dividerColor": "#555555",
-        "iconColor": "#dddddd",
-        "iconDisabledColor": "#666666"
-    },
-    "contentSplitter": {
-        "handleColor": "#1f1f1f",
-        "horizontalHandleHeight": 4,
-        "verticalHandleWidth": 4
-    },
-    "navigationTree": {
-        "textColor": "#dddfdf",
-        "selectionBackgroundColor": "#2e2e2e",
-        "scrollBackgroundColor": "#404040",
-        "scrollHandleColor": "#dddddd",
-        "selectedTextColor": "#ffffff",
-        "folderIndicatorColor": "#edc518",
-        "branchIndicatorColor": "#e0e0e0",
-        "branchIndicatorSelectedColor": "#ffffff",
-        "folderIconColor": "#e0e0e0",
-        "folderIconShadowColor": "#000000",
-        "folderIconSelectedColor": "#e0e0e0",
-        "folderIconSelectedShadowColor": "#000000",
-        "folderReadOverlayColor": "#222222",
-        "folderReadOverlaySelectedColor": "#222222"
-    },
     "comicsViewTable": {
         "alternateBackgroundColor": "#2e2e2e",
         "backgroundColor": "#2a2a2a",
         "headerBackgroundColor": "#2a2a2a",
         "headerBorderColor": "#1f1f1f",
         "headerGradientColor": "#252525",
+        "headerTextColor": "#dddddd",
         "itemBorderBottomColor": "#1f1f1f",
-        "itemBorderTopColor": "#353535",
         "itemBorderBottomWidth": 1,
+        "itemBorderTopColor": "#353535",
         "itemBorderTopWidth": 1,
         "itemTextColor": "#dddddd",
         "selectedColor": "#555555",
         "selectedTextColor": "#ffffff",
-        "headerTextColor": "#dddddd",
         "starRatingColor": "#e9be0f",
         "starRatingSelectedColor": "#ffffff"
     },
-    "gridAndInfoView": {
+    "comicsViewToolbar": {
         "backgroundColor": "#2a2a2a",
+        "checkedBackgroundColor": "#555555",
+        "iconColor": "#dddddd",
+        "separatorColor": "#444444"
+    },
+    "contentSplitter": {
+        "handleColor": "#1f1f1f",
+        "horizontalHandleHeight": 4,
+        "verticalHandleWidth": 4
+    },
+    "dialogIcons": {
+        "iconColor": "#f7f7f7"
+    },
+    "emptyContainer": {
+        "backgroundColor": "#2a2a2a",
+        "descriptionTextColor": "#aaaaaa",
+        "searchIconColor": "#4c4c4c",
+        "textColor": "#cccccc",
+        "titleTextColor": "#cccccc"
+    },
+    "gridAndInfoView": {
+        "backgroundBlurOverlayColor": "#2a2a2a",
+        "backgroundColor": "#2a2a2a",
+        "borderColor": "#121212",
         "cellColor": "#212121",
         "cellColorWithBackground": "#99212121",
-        "selectedColor": "#121212",
-        "selectedBorderColor": "#ffcc00",
-        "borderColor": "#121212",
-        "titleColor": "#ffffff",
-        "textColor": "#a8a8a8",
-        "showDropShadow": true,
+        "continueReadingBackgroundColor": "#88000000",
+        "continueReadingColor": "#ffffff",
+        "currentComicBackgroundColor": "#88000000",
+        "favCheckedColor": "#e84852",
+        "favUncheckedColor": "#1c1c1c",
         "infoBackgroundColor": "#2e2e2e",
         "infoBorderColor": "#404040",
         "infoShadowColor": "#000000",
         "infoTextColor": "#b0b0b0",
         "infoTitleColor": "#ffffff",
-        "ratingUnselectedColor": "#1c1c1c",
         "ratingSelectedColor": "#ffffff",
-        "favUncheckedColor": "#1c1c1c",
-        "favCheckedColor": "#e84852",
-        "readTickUncheckedColor": "#1c1c1c",
+        "ratingUnselectedColor": "#1c1c1c",
         "readTickCheckedColor": "#e84852",
-        "currentComicBackgroundColor": "#88000000",
-        "continueReadingBackgroundColor": "#88000000",
-        "continueReadingColor": "#ffffff",
-        "backgroundBlurOverlayColor": "#2a2a2a"
+        "readTickUncheckedColor": "#1c1c1c",
+        "selectedBorderColor": "#ffcc00",
+        "selectedColor": "#121212",
+        "showDropShadow": true,
+        "textColor": "#a8a8a8",
+        "titleColor": "#ffffff"
     },
-    "comicsViewToolbar": {
+    "helpAboutDialog": {
+        "headingColor": "#e0e0e0",
+        "linkColor": "#d4a84b"
+    },
+    "importWidget": {
         "backgroundColor": "#2a2a2a",
-        "separatorColor": "#444444",
-        "checkedBackgroundColor": "#555555",
-        "iconColor": "#dddddd"
+        "coversDecorationBgColor": "#3a3a3a",
+        "coversDecorationShadowColor": "#1a1a1a",
+        "coversLabelColor": "#aaaaaa",
+        "coversViewBackgroundColor": "#3a3a3a",
+        "currentComicTextColor": "#aaaaaa",
+        "descriptionTextColor": "#aaaaaa",
+        "iconCheckedColor": "#aaaaaa",
+        "iconColor": "#cccccc",
+        "modeIconColor": "#4a4a4a",
+        "titleTextColor": "#cccccc"
     },
-    "searchLineEdit": {
-        "textColor": "#ababab",
-        "backgroundColor": "#404040",
-        "iconColor": "#f7f7f7"
+    "libraryItem": {
+        "libraryIconColor": "#dddfdf",
+        "libraryIconSelectedColor": "#ffffff",
+        "libraryIconShadowColor": "#000000",
+        "libraryOptionsIconColor": "#ffffff",
+        "selectedBackgroundColor": "#2e2e2e",
+        "selectedTextColor": "#ffffff",
+        "textColor": "#dddfdf"
     },
-    "readingListIcons": {
-        "labelColors": {
-            "red": "#f67a7b",
-            "orange": "#f5c240",
-            "yellow": "#f2e446",
-            "green": "#ade738",
-            "cyan": "#a0fddb",
-            "blue": "#82c7ff",
-            "violet": "#8f95ff",
-            "purple": "#d692fc",
-            "pink": "#fd9cda",
-            "white": "#fcfcfc",
-            "light": "#cbcbcb",
-            "dark": "#b7b7b7"
-        },
-        "labelShadowColor": "#000000",
-        "labelShadowSelectedColor": "#000000",
-        "readingListMainColor": "#e7e7e7",
-        "readingListMainSelectedColor": "#e7e7e7",
-        "favoritesMainColor": "#e15055",
-        "favoritesMainSelectedColor": "#e15055",
-        "currentlyReadingMainColor": "#ffcc00",
-        "currentlyReadingMainSelectedColor": "#ffcc00",
-        "currentlyReadingOuterColor": "#000000",
-        "currentlyReadingOuterSelectedColor": "#000000",
-        "specialListShadowColor": "#000000",
-        "specialListShadowSelectedColor": "#000000",
-        "listMainColor": "#e7e7e7",
-        "listMainSelectedColor": "#e7e7e7",
-        "listShadowColor": "#000000",
-        "listShadowSelectedColor": "#000000",
-        "listDetailColor": "#464646",
-        "listDetailSelectedColor": "#464646"
-    },
-    "dialogIcons": {
-        "iconColor": "#f7f7f7"
+    "mainToolbar": {
+        "backgroundColor": "#2a2a2a",
+        "dividerColor": "#555555",
+        "folderNameColor": "#dddddd",
+        "iconColor": "#dddddd",
+        "iconDisabledColor": "#666666"
     },
     "menuIcons": {
         "iconColor": "#f7f7f7"
     },
+    "meta": {
+        "displayName": "Default Dark",
+        "id": "builtin/dark",
+        "variant": "dark"
+    },
+    "metadataScraperDialog": {
+        "busyIndicatorColor": "#ffffff",
+        "buttonBackgroundColor": "#2e2e2e",
+        "buttonBorderColor": "#242424",
+        "buttonTextColor": "#ffffff",
+        "checkBoxTickColor": "#ffffff",
+        "contentAltBackgroundColor": "#2e2e2e",
+        "contentBackgroundColor": "#2b2b2b",
+        "contentTextColor": "#ffffff",
+        "dialogBackgroundColor": "#404040",
+        "downArrowColor": "#9f9f9f",
+        "hyperlinkColor": "#ffcc00",
+        "labelBackgroundColor": "#2b2b2b",
+        "labelTextColor": "#ffffff",
+        "navIconColor": "#ffffff",
+        "radioCheckedBackgroundColor": "#e5e5e5",
+        "radioCheckedIndicatorColor": "#5f5f5f",
+        "radioUncheckedColor": "#e5e5e5",
+        "rowIconColor": "#e5e5e5",
+        "tableAltBackgroundColor": "#2e2e2e",
+        "tableBackgroundColor": "#2b2b2b",
+        "tableBorderColor": "#242424",
+        "tableHeaderBackgroundColor": "#292929",
+        "tableHeaderBorderColor": "#1f1f1f",
+        "tableHeaderGradientColor": "#292929",
+        "tableHeaderTextColor": "#ebebeb",
+        "tableScrollBackgroundColor": "#404040",
+        "tableScrollHandleColor": "#dddddd",
+        "tableSectionBorderDark": "#dfdfdf",
+        "tableSectionBorderLight": "#fefefe",
+        "tableSelectedColor": "#555555",
+        "toolButtonAccentColor": "#282828",
+        "upArrowColor": "#9f9f9f"
+    },
+    "navigationTree": {
+        "branchIndicatorColor": "#e0e0e0",
+        "branchIndicatorSelectedColor": "#ffffff",
+        "folderIconColor": "#e0e0e0",
+        "folderIconSelectedColor": "#e0e0e0",
+        "folderIconSelectedShadowColor": "#000000",
+        "folderIconShadowColor": "#000000",
+        "folderIndicatorColor": "#edc518",
+        "folderReadOverlayColor": "#222222",
+        "folderReadOverlaySelectedColor": "#222222",
+        "scrollBackgroundColor": "#404040",
+        "scrollHandleColor": "#dddddd",
+        "selectedTextColor": "#ffffff",
+        "selectionBackgroundColor": "#2e2e2e",
+        "textColor": "#dddfdf"
+    },
+    "readingListIcons": {
+        "currentlyReadingMainColor": "#ffcc00",
+        "currentlyReadingMainSelectedColor": "#ffcc00",
+        "currentlyReadingOuterColor": "#000000",
+        "currentlyReadingOuterSelectedColor": "#000000",
+        "favoritesMainColor": "#e15055",
+        "favoritesMainSelectedColor": "#e15055",
+        "labelColors": {
+            "blue": "#82c7ff",
+            "cyan": "#a0fddb",
+            "dark": "#b7b7b7",
+            "green": "#ade738",
+            "light": "#cbcbcb",
+            "orange": "#f5c240",
+            "pink": "#fd9cda",
+            "purple": "#d692fc",
+            "red": "#f67a7b",
+            "violet": "#8f95ff",
+            "white": "#fcfcfc",
+            "yellow": "#f2e446"
+        },
+        "labelShadowColor": "#000000",
+        "labelShadowSelectedColor": "#000000",
+        "listDetailColor": "#464646",
+        "listDetailSelectedColor": "#464646",
+        "listMainColor": "#e7e7e7",
+        "listMainSelectedColor": "#e7e7e7",
+        "listShadowColor": "#000000",
+        "listShadowSelectedColor": "#000000",
+        "readingListMainColor": "#e7e7e7",
+        "readingListMainSelectedColor": "#e7e7e7",
+        "specialListShadowColor": "#000000",
+        "specialListShadowSelectedColor": "#000000"
+    },
+    "searchLineEdit": {
+        "backgroundColor": "#404040",
+        "iconColor": "#f7f7f7",
+        "textColor": "#ababab"
+    },
+    "serverConfigDialog": {
+        "backgroundColor": "#2a2a2a",
+        "checkBoxTextColor": "#dddddd",
+        "decorationColor": "#f7f7f7",
+        "labelTextColor": "#c0c0c0",
+        "propagandaTextColor": "#b0b0b0",
+        "qrBackgroundColor": "#2a2a2a",
+        "qrForegroundColor": "#ffffff",
+        "qrMessageTextColor": "#a3a3a3",
+        "titleTextColor": "#d0d0d0"
+    },
     "shortcutsIcons": {
         "iconColor": "#f7f7f7"
+    },
+    "sidebar": {
+        "backgroundColor": "#454545",
+        "busyIndicatorColor": "#ffffff",
+        "sectionSeparatorColor": "#575757",
+        "separatorColor": "#bdbfbf",
+        "titleDropShadowColor": "#000000",
+        "titleTextColor": "#bdbfbf",
+        "uppercaseLabels": true
+    },
+    "sidebarIcons": {
+        "iconColor": "#e0e0e0",
+        "shadowColor": "#000000",
+        "useSystemFolderIcons": false
+    },
+    "whatsNewDialog": {
+        "backgroundColor": "#2a2a2a",
+        "closeButtonColor": "#dddddd",
+        "contentTextColor": "#e0e0e0",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#e0e0e0",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }
diff --git a/YACReaderLibrary/themes/builtin_light.json b/YACReaderLibrary/themes/builtin_light.json
index f1cf40e4..9d514d4b 100644
--- a/YACReaderLibrary/themes/builtin_light.json
+++ b/YACReaderLibrary/themes/builtin_light.json
@@ -1,237 +1,237 @@
 {
-    "meta": {
-        "id": "builtin/light",
-        "displayName": "Default Light",
-        "variant": "light"
-    },
     "comicFlow": {
         "backgroundColor": "#dcdcdc",
         "textColor": "#303030"
     },
-    "metadataScraperDialog": {
-        "contentTextColor": "#000000",
-        "contentBackgroundColor": "#ececec",
-        "contentAltBackgroundColor": "#e0e0e0",
-        "dialogBackgroundColor": "#fbfbfb",
-        "tableBackgroundColor": "#f4f4f4",
-        "tableAltBackgroundColor": "#fafafa",
-        "tableBorderColor": "#cccccc",
-        "tableSelectedColor": "#dddddd",
-        "tableHeaderBackgroundColor": "#e0e0e0",
-        "tableHeaderGradientColor": "#e0e0e0",
-        "tableHeaderBorderColor": "#c0c0c0",
-        "tableHeaderTextColor": "#333333",
-        "tableScrollHandleColor": "#888888",
-        "tableScrollBackgroundColor": "#d0d0d0",
-        "tableSectionBorderLight": "#ffffff",
-        "tableSectionBorderDark": "#cccccc",
-        "labelTextColor": "#000000",
-        "labelBackgroundColor": "#ececec",
-        "hyperlinkColor": "#ffcc00",
-        "buttonBackgroundColor": "#e0e0e0",
-        "buttonTextColor": "#000000",
-        "buttonBorderColor": "#cccccc",
-        "radioUncheckedColor": "#e0e0e0",
-        "radioCheckedBackgroundColor": "#e0e0e0",
-        "radioCheckedIndicatorColor": "#222222",
-        "checkBoxTickColor": "#000000",
-        "toolButtonAccentColor": "#a0a0a0",
-        "downArrowColor": "#222222",
-        "upArrowColor": "#222222",
-        "busyIndicatorColor": "#000000",
-        "navIconColor": "#222222",
-        "rowIconColor": "#222222"
-    },
-    "helpAboutDialog": {
-        "headingColor": "#302f2d",
-        "linkColor": "#c19441"
-    },
-    "whatsNewDialog": {
-        "backgroundColor": "#ffffff",
-        "headerTextColor": "#0a0a0a",
-        "versionTextColor": "#858585",
-        "contentTextColor": "#0a0a0a",
-        "linkColor": "#e8b800",
-        "closeButtonColor": "#444444",
-        "headerDecorationColor": "#e8b800"
-    },
-    "emptyContainer": {
-        "backgroundColor": "#ffffff",
-        "titleTextColor": "#888888",
-        "textColor": "#495252",
-        "descriptionTextColor": "#565959",
-        "searchIconColor": "#cccccc"
-    },
-    "sidebar": {
-        "backgroundColor": "#fbfbfb",
-        "separatorColor": "#808080",
-        "sectionSeparatorColor": "#e0e0e0",
-        "uppercaseLabels": true,
-        "titleTextColor": "#4a494a",
-        "titleDropShadowColor": "#ffffff",
-        "busyIndicatorColor": "#808080"
-    },
-    "sidebarIcons": {
-        "iconColor": "#4f4e4f",
-        "shadowColor": "#fbfbfb",
-        "useSystemFolderIcons": false
-    },
-    "libraryItem": {
-        "textColor": "#000000",
-        "libraryIconColor": "#606060",
-        "libraryIconShadowColor": "#ffffff",
-        "selectedTextColor": "#ffffff",
-        "selectedBackgroundColor": "#333133",
-        "libraryIconSelectedColor": "#ffffff",
-        "libraryOptionsIconColor": "#ffffff"
-    },
-    "importWidget": {
-        "backgroundColor": "#fafafa",
-        "titleTextColor": "#495252",
-        "descriptionTextColor": "#565959",
-        "currentComicTextColor": "#565959",
-        "coversViewBackgroundColor": "#e6e6e6",
-        "coversLabelColor": "#565959",
-        "coversDecorationBgColor": "#e6e6e6",
-        "coversDecorationShadowColor": "#a1a1a1",
-        "modeIconColor": "#e6e6e6",
-        "iconColor": "#495252",
-        "iconCheckedColor": "#565959"
-    },
-    "serverConfigDialog": {
-        "backgroundColor": "#ffffff",
-        "titleTextColor": "#474747",
-        "qrMessageTextColor": "#a3a3a3",
-        "propagandaTextColor": "#4d4d4d",
-        "labelTextColor": "#575757",
-        "checkBoxTextColor": "#262626",
-        "qrBackgroundColor": "#ffffff",
-        "qrForegroundColor": "#606060",
-        "decorationColor": "#606060"
-    },
-    "mainToolbar": {
-        "backgroundColor": "#f0f0f0",
-        "folderNameColor": "#333133",
-        "dividerColor": "#b8bdc4",
-        "iconColor": "#333133",
-        "iconDisabledColor": "#b0b0b0"
-    },
-    "contentSplitter": {
-        "handleColor": "#f0f0f0",
-        "horizontalHandleHeight": 4,
-        "verticalHandleWidth": 4
-    },
-    "navigationTree": {
-        "textColor": "#000000",
-        "selectionBackgroundColor": "#333133",
-        "scrollBackgroundColor": "#e0e0e0",
-        "scrollHandleColor": "#888888",
-        "selectedTextColor": "#ffffff",
-        "folderIndicatorColor": "#555f7f",
-        "branchIndicatorColor": "#606060",
-        "branchIndicatorSelectedColor": "#ffffff",
-        "folderIconColor": "#606060",
-        "folderIconShadowColor": "#ffffff",
-        "folderIconSelectedColor": "#ffffff",
-        "folderIconSelectedShadowColor": "#161616",
-        "folderReadOverlayColor": "#ffffff",
-        "folderReadOverlaySelectedColor": "#161616"
-    },
     "comicsViewTable": {
         "alternateBackgroundColor": "#f2f2f2",
         "backgroundColor": "#fafafa",
         "headerBackgroundColor": "#f5f5f5",
         "headerBorderColor": "#b8bdc4",
         "headerGradientColor": "#f5f5f5",
+        "headerTextColor": "#313232",
         "itemBorderBottomColor": "#dfdfdf",
-        "itemBorderTopColor": "#fefefe",
         "itemBorderBottomWidth": 0,
+        "itemBorderTopColor": "#fefefe",
         "itemBorderTopWidth": 0,
         "itemTextColor": "#252626",
         "selectedColor": "#595959",
         "selectedTextColor": "#ffffff",
-        "headerTextColor": "#313232",
         "starRatingColor": "#e9be0f",
         "starRatingSelectedColor": "#ffffff"
     },
+    "comicsViewToolbar": {
+        "backgroundColor": "#f0f0f0",
+        "checkedBackgroundColor": "#cccccc",
+        "iconColor": "#404040",
+        "separatorColor": "#cccccc"
+    },
+    "contentSplitter": {
+        "handleColor": "#f0f0f0",
+        "horizontalHandleHeight": 4,
+        "verticalHandleWidth": 4
+    },
+    "dialogIcons": {
+        "iconColor": "#606060"
+    },
+    "emptyContainer": {
+        "backgroundColor": "#ffffff",
+        "descriptionTextColor": "#565959",
+        "searchIconColor": "#cccccc",
+        "textColor": "#495252",
+        "titleTextColor": "#888888"
+    },
     "gridAndInfoView": {
+        "backgroundBlurOverlayColor": "#9e9e9e",
         "backgroundColor": "#f6f6f6",
+        "borderColor": "#dbdbdb",
         "cellColor": "#ffffff",
         "cellColorWithBackground": "#99ffffff",
-        "selectedColor": "#ffffff",
-        "selectedBorderColor": "#ffcc00",
-        "borderColor": "#dbdbdb",
-        "titleColor": "#121212",
-        "textColor": "#636363",
-        "showDropShadow": true,
+        "continueReadingBackgroundColor": "#e8e8e8",
+        "continueReadingColor": "#000000",
+        "currentComicBackgroundColor": "#88ffffff",
+        "favCheckedColor": "#e84852",
+        "favUncheckedColor": "#dedede",
         "infoBackgroundColor": "#ffffff",
         "infoBorderColor": "#808080",
         "infoShadowColor": "#444444",
         "infoTextColor": "#404040",
         "infoTitleColor": "#2e2e2e",
-        "ratingUnselectedColor": "#dedede",
         "ratingSelectedColor": "#2b2b2b",
-        "favUncheckedColor": "#dedede",
-        "favCheckedColor": "#e84852",
-        "readTickUncheckedColor": "#dedede",
+        "ratingUnselectedColor": "#dedede",
         "readTickCheckedColor": "#e84852",
-        "currentComicBackgroundColor": "#88ffffff",
-        "continueReadingBackgroundColor": "#e8e8e8",
-        "continueReadingColor": "#000000",
-        "backgroundBlurOverlayColor": "#9e9e9e"
+        "readTickUncheckedColor": "#dedede",
+        "selectedBorderColor": "#ffcc00",
+        "selectedColor": "#ffffff",
+        "showDropShadow": true,
+        "textColor": "#636363",
+        "titleColor": "#121212"
     },
-    "comicsViewToolbar": {
+    "helpAboutDialog": {
+        "headingColor": "#302f2d",
+        "linkColor": "#c19441"
+    },
+    "importWidget": {
+        "backgroundColor": "#fafafa",
+        "coversDecorationBgColor": "#e6e6e6",
+        "coversDecorationShadowColor": "#a1a1a1",
+        "coversLabelColor": "#565959",
+        "coversViewBackgroundColor": "#e6e6e6",
+        "currentComicTextColor": "#565959",
+        "descriptionTextColor": "#565959",
+        "iconCheckedColor": "#565959",
+        "iconColor": "#495252",
+        "modeIconColor": "#e6e6e6",
+        "titleTextColor": "#495252"
+    },
+    "libraryItem": {
+        "libraryIconColor": "#606060",
+        "libraryIconSelectedColor": "#ffffff",
+        "libraryIconShadowColor": "#ffffff",
+        "libraryOptionsIconColor": "#ffffff",
+        "selectedBackgroundColor": "#333133",
+        "selectedTextColor": "#ffffff",
+        "textColor": "#000000"
+    },
+    "mainToolbar": {
         "backgroundColor": "#f0f0f0",
-        "separatorColor": "#cccccc",
-        "checkedBackgroundColor": "#cccccc",
-        "iconColor": "#404040"
-    },
-    "searchLineEdit": {
-        "textColor": "#ffffff",
-        "backgroundColor": "#333133",
-        "iconColor": "#efefef"
-    },
-    "readingListIcons": {
-        "labelColors": {
-            "red": "#f67a7b",
-            "orange": "#f5c240",
-            "yellow": "#f2e446",
-            "green": "#ade738",
-            "cyan": "#a0fddb",
-            "blue": "#82c7ff",
-            "violet": "#8f95ff",
-            "purple": "#d692fc",
-            "pink": "#fd9cda",
-            "white": "#fcfcfc",
-            "light": "#cbcbcb",
-            "dark": "#b7b7b7"
-        },
-        "labelShadowColor": "#8f8f8f",
-        "labelShadowSelectedColor": "#161616",
-        "readingListMainColor": "#808080",
-        "readingListMainSelectedColor": "#808080",
-        "favoritesMainColor": "#e15055",
-        "favoritesMainSelectedColor": "#e15055",
-        "currentlyReadingMainColor": "#ffcc00",
-        "currentlyReadingMainSelectedColor": "#ffcc00",
-        "currentlyReadingOuterColor": "#000000",
-        "currentlyReadingOuterSelectedColor": "#000000",
-        "specialListShadowColor": "#8f8f8f",
-        "specialListShadowSelectedColor": "#161616",
-        "listMainColor": "#808080",
-        "listMainSelectedColor": "#ffffff",
-        "listShadowColor": "#8f8f8f",
-        "listShadowSelectedColor": "#161616",
-        "listDetailColor": "#ffffff",
-        "listDetailSelectedColor": "#161616"
-    },
-    "dialogIcons": {
-        "iconColor": "#606060"
+        "dividerColor": "#b8bdc4",
+        "folderNameColor": "#333133",
+        "iconColor": "#333133",
+        "iconDisabledColor": "#b0b0b0"
     },
     "menuIcons": {
         "iconColor": "#606060"
     },
+    "meta": {
+        "displayName": "Default Light",
+        "id": "builtin/light",
+        "variant": "light"
+    },
+    "metadataScraperDialog": {
+        "busyIndicatorColor": "#000000",
+        "buttonBackgroundColor": "#e0e0e0",
+        "buttonBorderColor": "#cccccc",
+        "buttonTextColor": "#000000",
+        "checkBoxTickColor": "#000000",
+        "contentAltBackgroundColor": "#e0e0e0",
+        "contentBackgroundColor": "#ececec",
+        "contentTextColor": "#000000",
+        "dialogBackgroundColor": "#fbfbfb",
+        "downArrowColor": "#222222",
+        "hyperlinkColor": "#ffcc00",
+        "labelBackgroundColor": "#ececec",
+        "labelTextColor": "#000000",
+        "navIconColor": "#222222",
+        "radioCheckedBackgroundColor": "#e0e0e0",
+        "radioCheckedIndicatorColor": "#222222",
+        "radioUncheckedColor": "#e0e0e0",
+        "rowIconColor": "#222222",
+        "tableAltBackgroundColor": "#fafafa",
+        "tableBackgroundColor": "#f4f4f4",
+        "tableBorderColor": "#cccccc",
+        "tableHeaderBackgroundColor": "#e0e0e0",
+        "tableHeaderBorderColor": "#c0c0c0",
+        "tableHeaderGradientColor": "#e0e0e0",
+        "tableHeaderTextColor": "#333333",
+        "tableScrollBackgroundColor": "#d0d0d0",
+        "tableScrollHandleColor": "#888888",
+        "tableSectionBorderDark": "#cccccc",
+        "tableSectionBorderLight": "#ffffff",
+        "tableSelectedColor": "#dddddd",
+        "toolButtonAccentColor": "#a0a0a0",
+        "upArrowColor": "#222222"
+    },
+    "navigationTree": {
+        "branchIndicatorColor": "#606060",
+        "branchIndicatorSelectedColor": "#ffffff",
+        "folderIconColor": "#606060",
+        "folderIconSelectedColor": "#ffffff",
+        "folderIconSelectedShadowColor": "#161616",
+        "folderIconShadowColor": "#ffffff",
+        "folderIndicatorColor": "#555f7f",
+        "folderReadOverlayColor": "#ffffff",
+        "folderReadOverlaySelectedColor": "#161616",
+        "scrollBackgroundColor": "#e0e0e0",
+        "scrollHandleColor": "#888888",
+        "selectedTextColor": "#ffffff",
+        "selectionBackgroundColor": "#333133",
+        "textColor": "#000000"
+    },
+    "readingListIcons": {
+        "currentlyReadingMainColor": "#ffcc00",
+        "currentlyReadingMainSelectedColor": "#ffcc00",
+        "currentlyReadingOuterColor": "#000000",
+        "currentlyReadingOuterSelectedColor": "#000000",
+        "favoritesMainColor": "#e15055",
+        "favoritesMainSelectedColor": "#e15055",
+        "labelColors": {
+            "blue": "#82c7ff",
+            "cyan": "#a0fddb",
+            "dark": "#b7b7b7",
+            "green": "#ade738",
+            "light": "#cbcbcb",
+            "orange": "#f5c240",
+            "pink": "#fd9cda",
+            "purple": "#d692fc",
+            "red": "#f67a7b",
+            "violet": "#8f95ff",
+            "white": "#fcfcfc",
+            "yellow": "#f2e446"
+        },
+        "labelShadowColor": "#8f8f8f",
+        "labelShadowSelectedColor": "#161616",
+        "listDetailColor": "#ffffff",
+        "listDetailSelectedColor": "#161616",
+        "listMainColor": "#808080",
+        "listMainSelectedColor": "#ffffff",
+        "listShadowColor": "#8f8f8f",
+        "listShadowSelectedColor": "#161616",
+        "readingListMainColor": "#808080",
+        "readingListMainSelectedColor": "#808080",
+        "specialListShadowColor": "#8f8f8f",
+        "specialListShadowSelectedColor": "#161616"
+    },
+    "searchLineEdit": {
+        "backgroundColor": "#333133",
+        "iconColor": "#efefef",
+        "textColor": "#ffffff"
+    },
+    "serverConfigDialog": {
+        "backgroundColor": "#ffffff",
+        "checkBoxTextColor": "#262626",
+        "decorationColor": "#606060",
+        "labelTextColor": "#575757",
+        "propagandaTextColor": "#4d4d4d",
+        "qrBackgroundColor": "#ffffff",
+        "qrForegroundColor": "#606060",
+        "qrMessageTextColor": "#a3a3a3",
+        "titleTextColor": "#474747"
+    },
     "shortcutsIcons": {
         "iconColor": "#606060"
+    },
+    "sidebar": {
+        "backgroundColor": "#fbfbfb",
+        "busyIndicatorColor": "#808080",
+        "sectionSeparatorColor": "#e0e0e0",
+        "separatorColor": "#808080",
+        "titleDropShadowColor": "#ffffff",
+        "titleTextColor": "#4a494a",
+        "uppercaseLabels": true
+    },
+    "sidebarIcons": {
+        "iconColor": "#4f4e4f",
+        "shadowColor": "#fbfbfb",
+        "useSystemFolderIcons": false
+    },
+    "whatsNewDialog": {
+        "backgroundColor": "#ffffff",
+        "closeButtonColor": "#444444",
+        "contentTextColor": "#0a0a0a",
+        "headerDecorationColor": "#e8b800",
+        "headerTextColor": "#0a0a0a",
+        "linkColor": "#e8b800",
+        "versionTextColor": "#858585"
     }
 }