diff --git a/YACReaderLibrary/folder_content_view.cpp b/YACReaderLibrary/folder_content_view.cpp
index 1fe6c384..77106bc7 100644
--- a/YACReaderLibrary/folder_content_view.cpp
+++ b/YACReaderLibrary/folder_content_view.cpp
@@ -269,22 +269,22 @@ void FolderContentView::applyTheme(const Theme &theme)
 
     // Continue reading section colors
     ctxt->setContextProperty("continueReadingBackgroundColor", giv.continueReadingBackgroundColor);
-    ctxt->setContextProperty("continueReadingColor", giv.continueReadingColor);
+    ctxt->setContextProperty("continueReadingTextColor", giv.continueReadingTextColor);
 
     // Grid colors
     ctxt->setContextProperty("backgroundColor", giv.backgroundColor);
     ctxt->setContextProperty("cellColor", giv.cellColor);
-    ctxt->setContextProperty("selectedColor", giv.selectedColor);
-    ctxt->setContextProperty("selectedBorderColor", giv.selectedBorderColor);
+    ctxt->setContextProperty("cellSelectedColor", giv.cellSelectedColor);
+    ctxt->setContextProperty("cellSelectedBorderColor", giv.cellSelectedBorderColor);
     ctxt->setContextProperty("borderColor", giv.borderColor);
-    ctxt->setContextProperty("titleColor", giv.titleColor);
-    ctxt->setContextProperty("textColor", giv.textColor);
+    ctxt->setContextProperty("itemTitleColor", giv.itemTitleColor);
+    ctxt->setContextProperty("itemDetailsColor", giv.itemDetailsColor);
     ctxt->setContextProperty("dropShadow", QVariant(giv.showDropShadow));
 
     // Info panel colors
     ctxt->setContextProperty("infoBackgroundColor", giv.infoBackgroundColor);
+    ctxt->setContextProperty("infoMetadataTextColor", giv.infoMetadataTextColor);
     ctxt->setContextProperty("infoTextColor", giv.infoTextColor);
-    ctxt->setContextProperty("infoTitleColor", giv.infoTitleColor);
 
     // Rating and favorite colors
     ctxt->setContextProperty("ratingUnselectedColor", giv.ratingUnselectedColor);
diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
index 83c65197..c93ffcd2 100644
--- a/YACReaderLibrary/grid_comics_view.cpp
+++ b/YACReaderLibrary/grid_comics_view.cpp
@@ -222,7 +222,7 @@ void GridComicsView::updateBackgroundConfig()
     const auto &giv = theme.gridAndInfoView;
     ctxt->setContextProperty("backgroundColor", useBackgroundImage ? giv.backgroundBlurOverlayColor : giv.backgroundColor);
     ctxt->setContextProperty("cellColor", useBackgroundImage ? giv.cellColorWithBackground : giv.cellColor);
-    ctxt->setContextProperty("selectedColor", giv.selectedColor);
+    ctxt->setContextProperty("cellSelectedColor", giv.cellSelectedColor);
 }
 
 void GridComicsView::showInfo()
@@ -494,17 +494,17 @@ void GridComicsView::applyTheme(const Theme &theme)
     ctxt->setContextProperty("backgroundColor", giv.backgroundColor);
     ctxt->setContextProperty("backgroundBlurOverlayColor", giv.backgroundBlurOverlayColor);
     ctxt->setContextProperty("cellColor", giv.cellColor);
-    ctxt->setContextProperty("selectedColor", giv.selectedColor);
-    ctxt->setContextProperty("selectedBorderColor", giv.selectedBorderColor);
+    ctxt->setContextProperty("cellSelectedColor", giv.cellSelectedColor);
+    ctxt->setContextProperty("cellSelectedBorderColor", giv.cellSelectedBorderColor);
     ctxt->setContextProperty("borderColor", giv.borderColor);
-    ctxt->setContextProperty("titleColor", giv.titleColor);
-    ctxt->setContextProperty("textColor", giv.textColor);
+    ctxt->setContextProperty("itemTitleColor", giv.itemTitleColor);
+    ctxt->setContextProperty("itemDetailsColor", giv.itemDetailsColor);
     ctxt->setContextProperty("showDropShadow", QVariant(giv.showDropShadow));
 
     // Info panel colors
     ctxt->setContextProperty("infoBackgroundColor", giv.infoBackgroundColor);
+    ctxt->setContextProperty("infoMetadataTextColor", giv.infoMetadataTextColor);
     ctxt->setContextProperty("infoTextColor", giv.infoTextColor);
-    ctxt->setContextProperty("infoTitleColor", giv.infoTitleColor);
 
     // Rating and favorite colors
     ctxt->setContextProperty("ratingUnselectedColor", giv.ratingUnselectedColor);
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
index c79e3085..5e506d5c 100644
--- a/YACReaderLibrary/info_comics_view.cpp
+++ b/YACReaderLibrary/info_comics_view.cpp
@@ -239,8 +239,8 @@ void InfoComicsView::applyTheme(const Theme &theme)
     ctxt->setContextProperty("topShadow", svgUrl(giv.topShadow));
     ctxt->setContextProperty("infoShadow", svgUrl(giv.infoShadow));
     ctxt->setContextProperty("infoIndicator", svgUrl(giv.infoIndicator));
+    ctxt->setContextProperty("infoMetadataTextColor", giv.infoMetadataTextColor);
     ctxt->setContextProperty("infoTextColor", giv.infoTextColor);
-    ctxt->setContextProperty("infoTitleColor", giv.infoTitleColor);
 
     // Rating and favorite colors
     ctxt->setContextProperty("ratingUnselectedColor", giv.ratingUnselectedColor);
diff --git a/YACReaderLibrary/qml/ComicInfoView.qml b/YACReaderLibrary/qml/ComicInfoView.qml
index a5f8c166..c65e9fe0 100644
--- a/YACReaderLibrary/qml/ComicInfoView.qml
+++ b/YACReaderLibrary/qml/ComicInfoView.qml
@@ -13,7 +13,7 @@ Rectangle {
 
     height: info.height + 2 * topMargin
 
-    property string infoColor: infoTextColor
+    property string infoColor: infoMetadataTextColor
     property font infoFont: Qt.font({
 
                                         family: "Arial",
@@ -135,7 +135,7 @@ Rectangle {
 
                     id: title
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.bold: true
                     font.pixelSize: mainContainer.compact ? 18 : 21;
@@ -279,7 +279,7 @@ Rectangle {
                 Layout.fillWidth: true
 
                 id: sinopsis
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 15
                 wrapMode: Text.WordWrap
@@ -294,7 +294,7 @@ Rectangle {
                 Layout.bottomMargin: 5
 
                 id: characters_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -312,7 +312,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getCharacters().length : null
 
                     Text {
-                        color: infoTitleColor
+                        color: infoTextColor
                         font.family: "Arial"
                         font.pixelSize: 15
 
@@ -326,7 +326,7 @@ Rectangle {
                 Layout.bottomMargin: 5
 
                 id: main_character_or_team_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -337,7 +337,7 @@ Rectangle {
             }
 
             Text {
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 15
 
@@ -351,7 +351,7 @@ Rectangle {
                 Layout.bottomMargin: 5
 
                 id: teams_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -371,7 +371,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getTeams().length : null
 
                     Text {
-                        color: infoTitleColor
+                        color: infoTextColor
                         font.family: "Arial"
                         font.pixelSize: 15
 
@@ -385,7 +385,7 @@ Rectangle {
                 Layout.bottomMargin: 5
 
                 id: locations_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -403,7 +403,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getLocations().length : null
 
                     Text {
-                        color: infoTitleColor
+                        color: infoTextColor
                         font.family: "Arial"
                         font.pixelSize: 15
 
@@ -417,7 +417,7 @@ Rectangle {
                 Layout.bottomMargin: 5
 
                 id: authors_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -442,7 +442,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getWriters().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -450,7 +450,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -464,7 +464,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getPencillers().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -472,7 +472,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -486,7 +486,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getInkers().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -494,7 +494,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -508,7 +508,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getColorists().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -516,7 +516,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -530,7 +530,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getLetterers().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -538,7 +538,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -552,7 +552,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getCoverArtists().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -560,7 +560,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -574,7 +574,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getEditors().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -582,7 +582,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -596,7 +596,7 @@ Rectangle {
                     model: comicInfo ? comicInfo.getImprint().length : null
                     Column{
                         Text {
-                            color: infoTitleColor
+                            color: infoTextColor
                             font.family: "Arial"
                             font.pixelSize: 15
 
@@ -604,7 +604,7 @@ Rectangle {
                         }
 
                         Text {
-                            color: infoTextColor
+                            color: infoMetadataTextColor
                             font.family: "Arial"
                             font.pixelSize: 13
                             font.italic: true
@@ -618,7 +618,7 @@ Rectangle {
                 Layout.topMargin: 25
 
                 id: publisher_title
-                color: infoTitleColor
+                color: infoTextColor
                 font.family: "Arial"
                 font.pixelSize: 18
                 font.bold: true
@@ -635,7 +635,7 @@ Rectangle {
                 Text {
                     id: publisher
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
@@ -647,7 +647,7 @@ Rectangle {
                 Text {
                     id: format
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
@@ -659,7 +659,7 @@ Rectangle {
                 Text {
                     id: type
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
@@ -671,7 +671,7 @@ Rectangle {
                 Text {
                     id: color
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
@@ -683,7 +683,7 @@ Rectangle {
                 Text {
                     id: language
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
@@ -695,7 +695,7 @@ Rectangle {
                 Text {
                     id: age_rating
 
-                    color: infoTitleColor
+                    color: infoTextColor
                     font.family: "Arial"
                     font.pixelSize: 15
 
diff --git a/YACReaderLibrary/qml/FolderContentView.qml b/YACReaderLibrary/qml/FolderContentView.qml
index 6a2fcf33..98b70522 100644
--- a/YACReaderLibrary/qml/FolderContentView.qml
+++ b/YACReaderLibrary/qml/FolderContentView.qml
@@ -178,7 +178,7 @@ Rectangle {
                 wrapMode: Text.WordWrap
                 text: name
                 elide: Text.ElideRight
-                color: titleColor
+                color: itemTitleColor
                 font.letterSpacing: fontSpacing
                 font.pointSize: fontSize
                 font.family: fontFamily
@@ -221,7 +221,7 @@ Rectangle {
                     Text {
                         id: continueReadingText
                         text: qsTr("Continue Reading...")
-                        color: continueReadingColor
+                        color: continueReadingTextColor
                         anchors.left: parent.left
                         anchors.top: parent.top
                         anchors.topMargin: 15
@@ -297,7 +297,7 @@ Rectangle {
                                     wrapMode: Text.WordWrap
                                     text: readable_title
                                     elide: Text.ElideRight
-                                    color: titleColor
+                                    color: itemTitleColor
                                     font.letterSpacing: fontSpacing
                                     font.pointSize: fontSize
                                     font.family: fontFamily
diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml
index 69c987ba..1aa16186 100644
--- a/YACReaderLibrary/qml/GridComicsView.qml
+++ b/YACReaderLibrary/qml/GridComicsView.qml
@@ -108,8 +108,8 @@ SplitView {
                     width: itemWidth
                     height: itemHeight
 
-                    color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedColor:cellColor;
-                    //border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedBorderColor:borderColor;
+                    color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?cellSelectedColor:cellColor;
+                    //border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?cellSelectedBorderColor:borderColor;
                     //border.width: ?1:0;
                     anchors.horizontalCenter: parent.horizontalCenter
 
@@ -143,7 +143,7 @@ SplitView {
                             rightMargin  : commonBorder ? -commonBorderWidth : -rBorderwidth
                         }
 
-                        border.color: selectedBorderColor
+                        border.color: cellSelectedBorderColor
                         border.width: 3
 
                         opacity: (dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index) ? 1 : 0
@@ -330,7 +330,7 @@ SplitView {
                     wrapMode: Text.WordWrap
                     text: title
                     elide: Text.ElideRight
-                    color: titleColor
+                    color: itemTitleColor
                     clip: true
                     font.letterSpacing: fontSpacing
                     font.pointSize: fontSize
@@ -341,7 +341,7 @@ SplitView {
                 Text {
                     anchors {bottom: realCell.bottom; left: realCell.left; margins: 4}
                     text: number?"<b>#</b>"+number:""
-                    color: textColor
+                    color: itemDetailsColor
                     font.letterSpacing: fontSpacing
                     font.pointSize: fontSize
                     font.family: fontFamily
@@ -352,7 +352,7 @@ SplitView {
                     id: pageImage
                     anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 6; rightMargin: 4; leftMargin: 4}
                     source: "page.svg"
-                    color: textColor
+                    color: itemDetailsColor
                     width: 8
                     height: 10
                 }
@@ -362,7 +362,7 @@ SplitView {
                     id: pages
                     anchors {bottom: realCell.bottom; right: pageImage.left; margins: 4}
                     text: has_been_opened?current_page+"/"+num_pages:num_pages
-                    color: textColor
+                    color: itemDetailsColor
                     font.letterSpacing: fontSpacing
                     font.pointSize: fontSize
                     font.family: fontFamily
@@ -373,7 +373,7 @@ SplitView {
                     id: ratingImage
                     anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 6.5; rightMargin: Math.floor(pages.width)+12}
                     source: "star.svg"
-                    color: textColor
+                    color: itemDetailsColor
                     width: 11
                     height: 11
 
@@ -423,7 +423,7 @@ SplitView {
                     id: comicRating
                     anchors {bottom: realCell.bottom; right: ratingImage.left; margins: 4}
                     text: rating>0?rating:"-"
-                    color: textColor
+                    color: itemDetailsColor
                 }
             }
         }
@@ -511,7 +511,7 @@ SplitView {
 
                                 id: currentComicInfoTitleView
 
-                                color: infoTitleColor
+                                color: infoTextColor
                                 font.family: "Arial"
                                 font.bold: true
                                 font.pixelSize: 21
@@ -531,7 +531,7 @@ SplitView {
                                                                     family: "Arial",
                                                                     pixelSize: 14
                                                                 });
-                                property string infoFlowTextColor: infoTextColor
+                                property string infoFlowTextColor: infoMetadataTextColor
 
                                 Text {
                                     id: currentComicInfoVolume
@@ -643,7 +643,7 @@ SplitView {
                                     width: synopsisScroller.width
 
                                     id: currentComicInfoSinopsis
-                                    color: infoTitleColor
+                                    color: infoTextColor
                                     font.family: "Arial"
                                     font.pixelSize: 14
                                     wrapMode: Text.WordWrap
diff --git a/YACReaderLibrary/themes/builtin_classic.json b/YACReaderLibrary/themes/builtin_classic.json
index ebc56226..e3dc64ac 100644
--- a/YACReaderLibrary/themes/builtin_classic.json
+++ b/YACReaderLibrary/themes/builtin_classic.json
@@ -45,42 +45,42 @@
         "backgroundBlurOverlayColor": "#2a2a2a",
         "backgroundColor": "#2a2a2a",
         "borderColor": "#121212",
+        "buttonColor": "#ffcc00",
+        "buttonShadowColor": "#aa000000",
+        "buttonTextColor": "#ffffff",
         "cellColor": "#212121",
         "cellColorWithBackground": "#99212121",
+        "cellSelectedBorderColor": "#ffcc00",
+        "cellSelectedColor": "#121212",
+        "comicCoverBorderColor": "#30ffffff",
         "continueReadingBackgroundColor": "#88000000",
-        "continueReadingColor": "#ffffff",
+        "continueReadingTextColor": "#ffffff",
         "currentComicBackgroundColor": "#88000000",
+        "currentComicCoverShadowColor": "#ff000000",
         "favCheckedColor": "#e84852",
         "favUncheckedColor": "#1c1c1c",
+        "folderCoverBorderColor": "#20ffffff",
         "infoBackgroundColor": "#2e2e2e",
         "infoBorderColor": "#404040",
+        "infoMetadataTextColor": "#b0b0b0",
+        "infoScrollbarColor": "#ff424246",
         "infoShadowColor": "#000000",
-        "infoTextColor": "#b0b0b0",
-        "infoTitleColor": "#ffffff",
+        "infoTextColor": "#ffffff",
+        "itemDetailsColor": "#a8a8a8",
+        "itemTitleColor": "#ffffff",
+        "linkColor": "#ffcc00",
+        "newItemColor": "#ffffcc00",
+        "placeholderFolder1BorderColor": "#20ffffff",
+        "placeholderFolder1Color": "#20000000",
+        "placeholderFolder2BorderColor": "#20ffffff",
+        "placeholderFolder2Color": "#88000000",
         "ratingSelectedColor": "#ffffff",
         "ratingUnselectedColor": "#1c1c1c",
         "readTickCheckedColor": "#e84852",
         "readTickUncheckedColor": "#1c1c1c",
-        "selectedBorderColor": "#ffcc00",
-        "selectedColor": "#121212",
-        "showDropShadow": true,
-        "textColor": "#a8a8a8",
-        "titleColor": "#ffffff",
-        "newItemColor": "#ffffcc00",
-        "buttonColor": "#ffcc00",
-        "buttonTextColor": "#ffffff",
-        "linkColor": "#ffcc00",
-        "scrollbarColor": "#88424242",
         "scrollbarBorderColor": "#aa313131",
-        "infoScrollbarColor": "#ff424246",
-        "comicCoverBorderColor": "#30ffffff",
-        "folderCoverBorderColor": "#20ffffff",
-        "placeholderFolder1Color": "#20000000",
-        "placeholderFolder1BorderColor": "#20ffffff",
-        "placeholderFolder2Color": "#88000000",
-        "placeholderFolder2BorderColor": "#20ffffff",
-        "currentComicCoverShadowColor": "#ff000000",
-        "buttonShadowColor": "#aa000000"
+        "scrollbarColor": "#88424242",
+        "showDropShadow": true
     },
     "helpAboutDialog": {
         "headingColor": "#302f2d",
@@ -166,10 +166,10 @@
         "folderIconSelectedColor": "#e0e0e0",
         "folderIconSelectedShadowColor": "#000000",
         "folderIconShadowColor": "#000000",
-        "newItemColor": "#edc518",
         "folderNotCompletedColor": "#edc518",
         "folderReadOverlayColor": "#464646",
         "folderReadOverlaySelectedColor": "#464646",
+        "newItemColor": "#edc518",
         "scrollBackgroundColor": "#404040",
         "scrollHandleColor": "#dddddd",
         "selectedTextColor": "#ffffff",
diff --git a/YACReaderLibrary/themes/builtin_dark.json b/YACReaderLibrary/themes/builtin_dark.json
index e7765910..b625814d 100644
--- a/YACReaderLibrary/themes/builtin_dark.json
+++ b/YACReaderLibrary/themes/builtin_dark.json
@@ -45,42 +45,42 @@
         "backgroundBlurOverlayColor": "#2a2a2a",
         "backgroundColor": "#2a2a2a",
         "borderColor": "#121212",
+        "buttonColor": "#ffcc00",
+        "buttonShadowColor": "#aa000000",
+        "buttonTextColor": "#ffffff",
         "cellColor": "#212121",
         "cellColorWithBackground": "#99212121",
+        "cellSelectedBorderColor": "#ffcc00",
+        "cellSelectedColor": "#121212",
+        "comicCoverBorderColor": "#30ffffff",
         "continueReadingBackgroundColor": "#88000000",
-        "continueReadingColor": "#ffffff",
+        "continueReadingTextColor": "#ffffff",
         "currentComicBackgroundColor": "#55000000",
+        "currentComicCoverShadowColor": "#ff000000",
         "favCheckedColor": "#e84852",
         "favUncheckedColor": "#1c1c1c",
+        "folderCoverBorderColor": "#20ffffff",
         "infoBackgroundColor": "#2e2e2e",
         "infoBorderColor": "#404040",
+        "infoMetadataTextColor": "#b0b0b0",
+        "infoScrollbarColor": "#ff424246",
         "infoShadowColor": "#000000",
-        "infoTextColor": "#b0b0b0",
-        "infoTitleColor": "#ffffff",
+        "infoTextColor": "#ffffff",
+        "itemDetailsColor": "#a8a8a8",
+        "itemTitleColor": "#ffffff",
+        "linkColor": "#ffcc00",
+        "newItemColor": "#ffffcc00",
+        "placeholderFolder1BorderColor": "#20ffffff",
+        "placeholderFolder1Color": "#20000000",
+        "placeholderFolder2BorderColor": "#20ffffff",
+        "placeholderFolder2Color": "#88000000",
         "ratingSelectedColor": "#ffffff",
         "ratingUnselectedColor": "#1c1c1c",
         "readTickCheckedColor": "#e84852",
         "readTickUncheckedColor": "#1c1c1c",
-        "selectedBorderColor": "#ffcc00",
-        "selectedColor": "#121212",
-        "showDropShadow": true,
-        "textColor": "#a8a8a8",
-        "titleColor": "#ffffff",
-        "newItemColor": "#ffffcc00",
-        "buttonColor": "#ffcc00",
-        "buttonTextColor": "#ffffff",
-        "linkColor": "#ffcc00",
-        "scrollbarColor": "#88424242",
         "scrollbarBorderColor": "#aa313131",
-        "infoScrollbarColor": "#ff424246",
-        "comicCoverBorderColor": "#30ffffff",
-        "folderCoverBorderColor": "#20ffffff",
-        "placeholderFolder1Color": "#20000000",
-        "placeholderFolder1BorderColor": "#20ffffff",
-        "placeholderFolder2Color": "#88000000",
-        "placeholderFolder2BorderColor": "#20ffffff",
-        "currentComicCoverShadowColor": "#ff000000",
-        "buttonShadowColor": "#aa000000"
+        "scrollbarColor": "#88424242",
+        "showDropShadow": true
     },
     "helpAboutDialog": {
         "headingColor": "#e0e0e0",
@@ -166,10 +166,10 @@
         "folderIconSelectedColor": "#e0e0e0",
         "folderIconSelectedShadowColor": "#000000",
         "folderIconShadowColor": "#000000",
-        "newItemColor": "#edc518",
         "folderNotCompletedColor": "#edc518",
         "folderReadOverlayColor": "#222222",
         "folderReadOverlaySelectedColor": "#222222",
+        "newItemColor": "#edc518",
         "scrollBackgroundColor": "#404040",
         "scrollHandleColor": "#dddddd",
         "selectedTextColor": "#ffffff",
diff --git a/YACReaderLibrary/themes/builtin_light.json b/YACReaderLibrary/themes/builtin_light.json
index b1da08ac..cf6916ea 100644
--- a/YACReaderLibrary/themes/builtin_light.json
+++ b/YACReaderLibrary/themes/builtin_light.json
@@ -45,42 +45,42 @@
         "backgroundBlurOverlayColor": "#9e9e9e",
         "backgroundColor": "#f6f6f6",
         "borderColor": "#dbdbdb",
+        "buttonColor": "#ffcc00",
+        "buttonShadowColor": "#aa000000",
+        "buttonTextColor": "#ffffff",
         "cellColor": "#ffffff",
         "cellColorWithBackground": "#99ffffff",
+        "cellSelectedBorderColor": "#ffcc00",
+        "cellSelectedColor": "#ffffff",
+        "comicCoverBorderColor": "#30ffffff",
         "continueReadingBackgroundColor": "#e8e8e8",
-        "continueReadingColor": "#000000",
+        "continueReadingTextColor": "#000000",
         "currentComicBackgroundColor": "#88ffffff",
+        "currentComicCoverShadowColor": "#ff000000",
         "favCheckedColor": "#e84852",
         "favUncheckedColor": "#dedede",
+        "folderCoverBorderColor": "#20ffffff",
         "infoBackgroundColor": "#ffffff",
         "infoBorderColor": "#808080",
+        "infoMetadataTextColor": "#404040",
+        "infoScrollbarColor": "#ff424246",
         "infoShadowColor": "#444444",
-        "infoTextColor": "#404040",
-        "infoTitleColor": "#2e2e2e",
+        "infoTextColor": "#2e2e2e",
+        "itemDetailsColor": "#636363",
+        "itemTitleColor": "#121212",
+        "linkColor": "#ffcc00",
+        "newItemColor": "#ffffcc00",
+        "placeholderFolder1BorderColor": "#20ffffff",
+        "placeholderFolder1Color": "#20000000",
+        "placeholderFolder2BorderColor": "#20ffffff",
+        "placeholderFolder2Color": "#88000000",
         "ratingSelectedColor": "#2b2b2b",
         "ratingUnselectedColor": "#dedede",
         "readTickCheckedColor": "#e84852",
         "readTickUncheckedColor": "#dedede",
-        "selectedBorderColor": "#ffcc00",
-        "selectedColor": "#ffffff",
-        "showDropShadow": true,
-        "textColor": "#636363",
-        "titleColor": "#121212",
-        "newItemColor": "#ffffcc00",
-        "buttonColor": "#ffcc00",
-        "buttonTextColor": "#ffffff",
-        "linkColor": "#ffcc00",
-        "scrollbarColor": "#88424242",
         "scrollbarBorderColor": "#aa313131",
-        "infoScrollbarColor": "#ff424246",
-        "comicCoverBorderColor": "#30ffffff",
-        "folderCoverBorderColor": "#20ffffff",
-        "placeholderFolder1Color": "#20000000",
-        "placeholderFolder1BorderColor": "#20ffffff",
-        "placeholderFolder2Color": "#88000000",
-        "placeholderFolder2BorderColor": "#20ffffff",
-        "currentComicCoverShadowColor": "#ff000000",
-        "buttonShadowColor": "#aa000000"
+        "scrollbarColor": "#88424242",
+        "showDropShadow": true
     },
     "helpAboutDialog": {
         "headingColor": "#302f2d",
@@ -166,10 +166,10 @@
         "folderIconSelectedColor": "#ffffff",
         "folderIconSelectedShadowColor": "#161616",
         "folderIconShadowColor": "#ffffff",
-        "newItemColor": "#555f7f",
         "folderNotCompletedColor": "#555f7f",
         "folderReadOverlayColor": "#ffffff",
         "folderReadOverlaySelectedColor": "#161616",
+        "newItemColor": "#555f7f",
         "scrollBackgroundColor": "#e0e0e0",
         "scrollHandleColor": "#888888",
         "selectedTextColor": "#ffffff",
diff --git a/YACReaderLibrary/themes/theme.h b/YACReaderLibrary/themes/theme.h
index f44e4b57..bc0ca8cc 100644
--- a/YACReaderLibrary/themes/theme.h
+++ b/YACReaderLibrary/themes/theme.h
@@ -215,11 +215,11 @@ struct GridAndInfoViewTheme {
     QColor backgroundColor;
     QColor cellColor;
     QColor cellColorWithBackground;
-    QColor selectedColor;
-    QColor selectedBorderColor;
+    QColor cellSelectedColor;
+    QColor cellSelectedBorderColor;
     QColor borderColor;
-    QColor titleColor;
-    QColor textColor;
+    QColor itemTitleColor;
+    QColor itemDetailsColor;
     bool showDropShadow;
 
     // Info panel colors
@@ -227,8 +227,8 @@ struct GridAndInfoViewTheme {
     QString topShadow; // Recolored SVG path
     QString infoShadow; // Recolored SVG path
     QString infoIndicator; // Recolored SVG path
+    QColor infoMetadataTextColor;
     QColor infoTextColor;
-    QColor infoTitleColor;
 
     // Rating and favorite colors
     QColor ratingUnselectedColor;
@@ -243,7 +243,7 @@ struct GridAndInfoViewTheme {
 
     // Continue reading section (FolderContentView)
     QColor continueReadingBackgroundColor;
-    QColor continueReadingColor;
+    QColor continueReadingTextColor;
 
     // Blur overlay background (FlowView always, GridView when background image enabled)
     QColor backgroundBlurOverlayColor;
diff --git a/YACReaderLibrary/themes/theme_factory.cpp b/YACReaderLibrary/themes/theme_factory.cpp
index cef847da..550611d8 100644
--- a/YACReaderLibrary/themes/theme_factory.cpp
+++ b/YACReaderLibrary/themes/theme_factory.cpp
@@ -143,19 +143,19 @@ struct GridAndInfoViewParams {
     QColor backgroundColor;
     QColor cellColor;
     QColor cellColorWithBackground;
-    QColor selectedColor;
-    QColor selectedBorderColor;
+    QColor cellSelectedColor;
+    QColor cellSelectedBorderColor;
     QColor borderColor;
-    QColor titleColor;
-    QColor textColor;
+    QColor itemTitleColor;
+    QColor itemDetailsColor;
     bool showDropShadow;
 
     // Info panel colors
     QColor infoBackgroundColor;
     QColor infoBorderColor;
     QColor infoShadowColor;
+    QColor infoMetadataTextColor;
     QColor infoTextColor;
-    QColor infoTitleColor;
 
     // Rating and favorite colors
     QColor ratingUnselectedColor;
@@ -170,7 +170,7 @@ struct GridAndInfoViewParams {
 
     // Continue reading section (FolderContentView)
     QColor continueReadingBackgroundColor;
-    QColor continueReadingColor;
+    QColor continueReadingTextColor;
 
     // Blur overlay background (FlowView always, GridView when background image enabled)
     QColor backgroundBlurOverlayColor;
@@ -520,18 +520,18 @@ Theme makeTheme(const ThemeParams &params)
     theme.gridAndInfoView.backgroundColor = giv.backgroundColor;
     theme.gridAndInfoView.cellColor = giv.cellColor;
     theme.gridAndInfoView.cellColorWithBackground = giv.cellColorWithBackground;
-    theme.gridAndInfoView.selectedColor = giv.selectedColor;
-    theme.gridAndInfoView.selectedBorderColor = giv.selectedBorderColor;
+    theme.gridAndInfoView.cellSelectedColor = giv.cellSelectedColor;
+    theme.gridAndInfoView.cellSelectedBorderColor = giv.cellSelectedBorderColor;
     theme.gridAndInfoView.borderColor = giv.borderColor;
-    theme.gridAndInfoView.titleColor = giv.titleColor;
-    theme.gridAndInfoView.textColor = giv.textColor;
+    theme.gridAndInfoView.itemTitleColor = giv.itemTitleColor;
+    theme.gridAndInfoView.itemDetailsColor = giv.itemDetailsColor;
     theme.gridAndInfoView.showDropShadow = giv.showDropShadow;
     theme.gridAndInfoView.infoBackgroundColor = giv.infoBackgroundColor;
     theme.gridAndInfoView.topShadow = recoloredSvgToThemeFile(":/qml/info-top-shadow.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
     theme.gridAndInfoView.infoShadow = recoloredSvgToThemeFile(":/qml/info-shadow.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
     theme.gridAndInfoView.infoIndicator = recoloredSvgToThemeFile(":/qml/info-indicator.svg", giv.infoBackgroundColor, giv.infoBorderColor, giv.infoShadowColor, params.meta.id);
+    theme.gridAndInfoView.infoMetadataTextColor = giv.infoMetadataTextColor;
     theme.gridAndInfoView.infoTextColor = giv.infoTextColor;
-    theme.gridAndInfoView.infoTitleColor = giv.infoTitleColor;
     theme.gridAndInfoView.ratingUnselectedColor = giv.ratingUnselectedColor;
     theme.gridAndInfoView.ratingSelectedColor = giv.ratingSelectedColor;
     theme.gridAndInfoView.favUncheckedColor = giv.favUncheckedColor;
@@ -540,7 +540,7 @@ Theme makeTheme(const ThemeParams &params)
     theme.gridAndInfoView.readTickCheckedColor = giv.readTickCheckedColor;
     theme.gridAndInfoView.currentComicBackgroundColor = giv.currentComicBackgroundColor;
     theme.gridAndInfoView.continueReadingBackgroundColor = giv.continueReadingBackgroundColor;
-    theme.gridAndInfoView.continueReadingColor = giv.continueReadingColor;
+    theme.gridAndInfoView.continueReadingTextColor = giv.continueReadingTextColor;
     theme.gridAndInfoView.backgroundBlurOverlayColor = giv.backgroundBlurOverlayColor;
     theme.gridAndInfoView.newItemColor = giv.newItemColor;
     theme.gridAndInfoView.buttonColor = giv.buttonColor;
@@ -1114,18 +1114,18 @@ Theme makeTheme(const QJsonObject &json)
         giv.backgroundColor = colorFromJson(o, "backgroundColor", giv.backgroundColor);
         giv.cellColor = colorFromJson(o, "cellColor", giv.cellColor);
         giv.cellColorWithBackground = colorFromJson(o, "cellColorWithBackground", giv.cellColorWithBackground);
-        giv.selectedColor = colorFromJson(o, "selectedColor", giv.selectedColor);
-        giv.selectedBorderColor = colorFromJson(o, "selectedBorderColor", giv.selectedBorderColor);
+        giv.cellSelectedColor = colorFromJson(o, "cellSelectedColor", giv.cellSelectedColor);
+        giv.cellSelectedBorderColor = colorFromJson(o, "cellSelectedBorderColor", giv.cellSelectedBorderColor);
         giv.borderColor = colorFromJson(o, "borderColor", giv.borderColor);
-        giv.titleColor = colorFromJson(o, "titleColor", giv.titleColor);
-        giv.textColor = colorFromJson(o, "textColor", giv.textColor);
+        giv.itemTitleColor = colorFromJson(o, "itemTitleColor", giv.itemTitleColor);
+        giv.itemDetailsColor = colorFromJson(o, "itemDetailsColor", giv.itemDetailsColor);
         if (o.contains("showDropShadow"))
             giv.showDropShadow = o["showDropShadow"].toBool(giv.showDropShadow);
         giv.infoBackgroundColor = colorFromJson(o, "infoBackgroundColor", giv.infoBackgroundColor);
         giv.infoBorderColor = colorFromJson(o, "infoBorderColor", giv.infoBorderColor);
         giv.infoShadowColor = colorFromJson(o, "infoShadowColor", giv.infoShadowColor);
+        giv.infoMetadataTextColor = colorFromJson(o, "infoMetadataTextColor", giv.infoMetadataTextColor);
         giv.infoTextColor = colorFromJson(o, "infoTextColor", giv.infoTextColor);
-        giv.infoTitleColor = colorFromJson(o, "infoTitleColor", giv.infoTitleColor);
         giv.ratingUnselectedColor = colorFromJson(o, "ratingUnselectedColor", giv.ratingUnselectedColor);
         giv.ratingSelectedColor = colorFromJson(o, "ratingSelectedColor", giv.ratingSelectedColor);
         giv.favUncheckedColor = colorFromJson(o, "favUncheckedColor", giv.favUncheckedColor);
@@ -1134,7 +1134,7 @@ Theme makeTheme(const QJsonObject &json)
         giv.readTickCheckedColor = colorFromJson(o, "readTickCheckedColor", giv.readTickCheckedColor);
         giv.currentComicBackgroundColor = colorFromJson(o, "currentComicBackgroundColor", giv.currentComicBackgroundColor);
         giv.continueReadingBackgroundColor = colorFromJson(o, "continueReadingBackgroundColor", giv.continueReadingBackgroundColor);
-        giv.continueReadingColor = colorFromJson(o, "continueReadingColor", giv.continueReadingColor);
+        giv.continueReadingTextColor = colorFromJson(o, "continueReadingTextColor", giv.continueReadingTextColor);
         giv.backgroundBlurOverlayColor = colorFromJson(o, "backgroundBlurOverlayColor", giv.backgroundBlurOverlayColor);
         giv.newItemColor = colorFromJson(o, "newItemColor", giv.newItemColor);
         giv.buttonColor = colorFromJson(o, "buttonColor", giv.buttonColor);