diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css
index 2dcfd1bd..f2ec1bc0 100644
--- a/source/Ox.UI/css/theme.css
+++ b/source/Ox.UI/css/theme.css
@@ -520,7 +520,7 @@ Lists
         $listIconTextShadow 1px 1px 0;
 }
 .$themeClass .OxIconList .OxItem.OxSelected > .OxText > div,
-.$themeClass .OxInfoList .OxItem.OxSelected .OxText div:not(.OxSpecialTarget) {
+.$themeClass .OxInfoList .OxItem.OxSelected .OxText > div:not(.OxSpecialTarget) {
     border-color: $listIconLabelSelectedBorder;
     background-image: -moz-linear-gradient(top, $listIconLabelSelectedGradient);
     background-image: -o-linear-gradient(top, $listIconLabelSelectedGradient);
@@ -536,7 +536,7 @@ Lists
     -webkit-box-shadow: 0 0 4px $listIconLabelSelectedShadow;
 }
 .$themeClass .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div,
-.$themeClass .OxInfoList.OxFocus .OxItem.OxSelected .OxText div:not(.OxSpecialTarget) {
+.$themeClass .OxInfoList.OxFocus .OxItem.OxSelected .OxText > div:not(.OxSpecialTarget) {
     border-color: $listIconLabelFocusSelectedBorder;
     background-image: -moz-linear-gradient(top, $listIconLabelFocusSelectedGradient);
     background-image: -o-linear-gradient(top, $listIconLabelFocusSelectedGradient);
@@ -751,8 +751,8 @@ Media
         $mediaListIconTextShadow 1px -1px 0,
         $mediaListIconTextShadow 1px 1px 0;
 }
-.$themeClass .OxIconList.OxMedia .OxItem.OxSelected > .OxText div,
-.$themeClass .OxInfoList.OxMedia .OxItem.OxSelected .OxText div:not(.OxSpecialTarget) {
+.$themeClass .OxIconList.OxMedia .OxItem.OxSelected > .OxText > div,
+.$themeClass .OxInfoList.OxMedia .OxItem.OxSelected .OxText > div:not(.OxSpecialTarget) {
     border-color: $mediaListIconLabelSelectedBorder;
     background-image: -moz-linear-gradient(top, $mediaListIconLabelSelectedGradient);
     background-image: -o-linear-gradient(top, $mediaListIconLabelSelectedGradient);
@@ -767,8 +767,8 @@ Media
     -o-box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
     -webkit-box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
 }
-.$themeClass .OxIconList.OxMedia.OxFocus .OxItem.OxSelected > .OxText div,
-.$themeClass .OxInfoList.OxMedia.OxFocus .OxItem.OxSelected .OxText div:not(.OxSpecialTarget) {
+.$themeClass .OxIconList.OxMedia.OxFocus .OxItem.OxSelected > .OxText > div,
+.$themeClass .OxInfoList.OxMedia.OxFocus .OxItem.OxSelected .OxText > div:not(.OxSpecialTarget) {
     border-color: $mediaListIconLabelFocusSelectedBorder;
     background-image: -moz-linear-gradient(top, $mediaListIconLabelFocusSelectedGradient);
     background-image: -o-linear-gradient(top, $mediaListIconLabelFocusSelectedGradient);
diff --git a/source/Ox.UI/themes/oxdark/json/theme.jsonc b/source/Ox.UI/themes/oxdark/json/theme.jsonc
index 1607c39a..6ba1de3f 100644
--- a/source/Ox.UI/themes/oxdark/json/theme.jsonc
+++ b/source/Ox.UI/themes/oxdark/json/theme.jsonc
@@ -99,14 +99,14 @@
     "listIconLoadingGradient": [[32, 32, 32], [0, 0, 0]],
     "listIconFocusSelectedBorder": [128, 128, 128],
     "listIconFocusSelectedShadow": [128, 128, 128],
-    "listIconSelectedBorder": [64, 64, 64],
-    "listIconSelectedShadow": [64, 64, 64],
+    "listIconSelectedBorder": [96, 96, 96],
+    "listIconSelectedShadow": [96, 96, 96],
     "listIconLabelFocusSelectedBorder": [128, 128, 128],
     "listIconLabelFocusSelectedGradient": [[128, 128, 128, 0.5], [128, 128, 128, 0.5]],
     "listIconLabelFocusSelectedShadow": [128, 128, 128],
-    "listIconLabelSelectedBorder": [92, 92, 92], // wrong?
-    "listIconLabelSelectedGradient": [[92, 92, 92, 0.5], [92, 92, 92, 0.5]], // wrong? 
-    "listIconLabelSelectedShadow": [64, 64, 64], // wrong?
+    "listIconLabelSelectedBorder": [96, 96, 96],
+    "listIconLabelSelectedGradient": [[96, 96, 96, 0.5], [96, 96, 96, 0.5]],
+    "listIconLabelSelectedShadow": [96, 96, 96],
     "listIconTextShadow": [16, 16, 16],
     "listIconTextFocusSelectedShadow": [0, 0, 0],
     "listIconTextSelectedShadow": [16, 16, 16],
@@ -149,14 +149,14 @@
     "mediaListIconLoadingGradient": [[32, 32, 32], [0, 0, 0]],
     "mediaListIconFocusSelectedBorder": [128, 128, 128],
     "mediaListIconFocusSelectedShadow": [128, 128, 128],
-    "mediaListIconSelectedBorder": [64, 64, 64],
-    "mediaListIconSelectedShadow": [64, 64, 64],
+    "mediaListIconSelectedBorder": [96, 96, 96],
+    "mediaListIconSelectedShadow": [96, 96, 96],
     "mediaListIconLabelFocusSelectedBorder": [128, 128, 128],
     "mediaListIconLabelFocusSelectedGradient": [[128, 128, 128, 0.5], [128, 128, 128, 0.5]],
     "mediaListIconLabelFocusSelectedShadow": [128, 128, 128],
-    "mediaListIconLabelSelectedBorder": [92, 92, 92], // wrong?
-    "mediaListIconLabelSelectedGradient": [[92, 92, 92, 0.5], [92, 92, 92, 0.5]], // wrong? 
-    "mediaListIconLabelSelectedShadow": [64, 64, 64], // wrong?
+    "mediaListIconLabelSelectedBorder": [96, 96, 96],
+    "mediaListIconLabelSelectedGradient": [[96, 96, 96, 0.5], [96, 96, 96, 0.5]],
+    "mediaListIconLabelSelectedShadow": [96, 96, 96],
     "mediaListIconTextColor": [240, 240, 240],
     "mediaListIconTextFocusSelectedColor": [255, 255, 255],
     "mediaListIconTextSelectedColor": [240, 240, 240],
diff --git a/source/Ox.UI/themes/oxlight/json/theme.jsonc b/source/Ox.UI/themes/oxlight/json/theme.jsonc
index 7e448194..4399f6ef 100644
--- a/source/Ox.UI/themes/oxlight/json/theme.jsonc
+++ b/source/Ox.UI/themes/oxlight/json/theme.jsonc
@@ -99,8 +99,8 @@
     "listIconLoadingGradient": [[255, 255, 255], [224, 224, 224]],
     "listIconFocusSelectedBorder": [128, 128, 128],
     "listIconFocusSelectedShadow": [128, 128, 128],
-    "listIconSelectedBorder": [192, 192, 192],
-    "listIconSelectedShadow": [192, 192, 192],
+    "listIconSelectedBorder": [160, 160, 160],
+    "listIconSelectedShadow": [160, 160, 160],
     "listIconLabelFocusSelectedBorder": [128, 128, 128],
     "listIconLabelFocusSelectedGradient": [[128, 128, 128, 0.5], [128, 128, 128, 0.5]],
     "listIconLabelFocusSelectedShadow": [128, 128, 128],
@@ -149,8 +149,8 @@
     "mediaListIconLoadingGradient": [[255, 255, 255], [224, 224, 224]],
     "mediaListIconFocusSelectedBorder": [128, 128, 128],
     "mediaListIconFocusSelectedShadow": [128, 128, 128],
-    "mediaListIconSelectedBorder": [192, 192, 192],
-    "mediaListIconSelectedShadow": [192, 192, 192],
+    "mediaListIconSelectedBorder": [160, 160, 160],
+    "mediaListIconSelectedShadow": [160, 160, 160],
     "mediaListIconLabelFocusSelectedBorder": [128, 128, 128],
     "mediaListIconLabelFocusSelectedGradient": [[128, 128, 128, 0.5], [128, 128, 128, 0.5]],
     "mediaListIconLabelFocusSelectedShadow": [128, 128, 128],