diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css
index 6a6a1a2b..575e8cd4 100644
--- a/source/Ox.UI/css/theme.css
+++ b/source/Ox.UI/css/theme.css
@@ -218,6 +218,7 @@ Dialog
 */
 
 .$themeClass .OxDialog {
+    box-shadow: 0 2px 8px $dialogShadow;
     -moz-box-shadow: 0 2px 8px $dialogShadow;
     -o-box-shadow: 0 2px 8px $dialogShadow;
     -webkit-box-shadow: 0 2px 8px $dialogShadow;
@@ -314,6 +315,7 @@ Forms
     background-image: -webkit-linear-gradient(top, $inputActiveGradient);
 }
 .$themeClass .OxButton:focus {
+    box-shadow: 0 0 2px $formelementFocusShadow;
     -moz-box-shadow: 0 0 2px $formelementFocusShadow;
     -o-box-shadow: 0 0 2px $formelementFocusShadow;
     -webkit-box-shadow: 0 0 2px $formelementFocusShadow;
@@ -388,12 +390,14 @@ Forms
 }
 .$themeClass .OxInput:focus {
     border-color: $inputFocusBorder;
+    box-shadow: inset 0 0 2px $inputFocusShadow;
     -moz-box-shadow: inset 0 0 2px $inputFocusShadow;
     -o-box-shadow: inset 0 0 2px $inputFocusShadow;
     -webkit-box-shadow: inset 0 0 2px $inputFocusShadow;
 }
 .$themeClass div.OxInput.OxFocus,
 .$themeClass .OxSelect.OxFocus {
+    box-shadow: 0 0 2px $formelementFocusShadow;
     -moz-box-shadow: 0 0 2px $formelementFocusShadow;
     -o-box-shadow: 0 0 2px $formelementFocusShadow;
     -webkit-box-shadow: 0 0 2px $formelementFocusShadow;
@@ -461,6 +465,7 @@ Lists
 .$themeClass .OxInfoList .OxItem.OxSelected .OxIcon > img,
 .$themeClass .OxInfoList .OxItem.OxSelected .OxIcon > .OxVideoPlayer {
     border-color: $listIconSelectedBorder;
+    box-shadow: 0 0 4px $listIconSelectedShadow;
     -moz-box-shadow: 0 0 4px $listIconSelectedShadow;
     -o-box-shadow: 0 0 4px $listIconSelectedShadow;
     -webkit-box-shadow: 0 0 4px $listIconSelectedShadow;
@@ -470,6 +475,7 @@ Lists
 .$themeClass .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon > img,
 .$themeClass .OxInfoList.OxFocus .OxItem.OxSelected .OxIcon > .OxVideoPlayer {
     border-color: $listIconFocusSelectedBorder;
+    box-shadow: 0 0 4px $listIconFocusSelectedShadow;
     -moz-box-shadow: 0 0 4px $listIconFocusSelectedShadow;
     -o-box-shadow: 0 0 4px $listIconFocusSelectedShadow;
     -webkit-box-shadow: 0 0 4px $listIconFocusSelectedShadow;
@@ -492,6 +498,7 @@ Lists
         $listIconTextSelectedShadow -1px 1px 0,
         $listIconTextSelectedShadow 1px -1px 0,
         $listIconTextSelectedShadow 1px 1px 0;
+    box-shadow: 0 0 4px $listIconLabelSelectedShadow;
     -moz-box-shadow: 0 0 4px $listIconLabelSelectedShadow;
     -o-box-shadow: 0 0 4px $listIconLabelSelectedShadow;
     -webkit-box-shadow: 0 0 4px $listIconLabelSelectedShadow;
@@ -507,6 +514,7 @@ Lists
         $listIconTextFocusSelectedShadow -1px 1px 0,
         $listIconTextFocusSelectedShadow 1px -1px 0,
         $listIconTextFocusSelectedShadow 1px 1px 0;
+    box-shadow: 0 0 4px $listIconLabelFocusSelectedShadow;
     -moz-box-shadow: 0 0 4px $listIconLabelFocusSelectedShadow;
     -o-box-shadow: 0 0 4px $listIconLabelFocusSelectedShadow;
     -webkit-box-shadow: 0 0 4px $listIconLabelFocusSelectedShadow;
@@ -528,6 +536,7 @@ Lists
 .$themeClass .OxInfoList .OxItem.OxSelected .OxInfoElement .OxText > div {
     border-color: transparent;
     background-image: none;
+    box-shadow: 0 0 0 transparent;
     -moz-box-shadow: 0 0 0 transparent;
     -o-box-shadow: 0 0 0 transparent;
     -webkit-box-shadow: 0 0 0 transparent;
@@ -540,6 +549,7 @@ Lists
 .$themeClass .OxInfoList.OxFocus .OxItem.OxSelected .OxInfoElement .OxText > div {
     border-color: transparent;
     background-image: none;
+    box-shadow: 0 0 0 transparent;
     -moz-box-shadow: 0 0 0 transparent;
     -o-box-shadow: 0 0 0 transparent;
     -webkit-box-shadow: 0 0 0 transparent;
@@ -686,6 +696,7 @@ Media
 .$themeClass .OxInfoList.OxMedia .OxItem.OxSelected .OxIcon > img,
 .$themeClass .OxInfoList.OxMedia .OxItem.OxSelected .OxIcon > .OxVideoPlayer {
     border-color: $mediaListIconSelectedBorder;
+    box-shadow: 0 0 4px $mediaListIconSelectedShadow;
     -moz-box-shadow: 0 0 4px $mediaListIconSelectedShadow;
     -o-box-shadow: 0 0 4px $mediaListIconSelectedShadow;
     -webkit-box-shadow: 0 0 4px $mediaListIconSelectedShadow;
@@ -695,6 +706,7 @@ Media
 .$themeClass .OxInfoList.OxMedia.OxFocus .OxItem.OxSelected .OxIcon > img,
 .$themeClass .OxInfoList.OxMedia.OxFocus .OxItem.OxSelected .OxIcon > .OxVideoPlayer {
     border-color: $mediaListIconFocusSelectedBorder;
+    box-shadow: 0 0 4px $mediaListIconFocusSelectedShadow;
     -moz-box-shadow: 0 0 4px $mediaListIconFocusSelectedShadow;
     -o-box-shadow: 0 0 4px $mediaListIconFocusSelectedShadow;
     -webkit-box-shadow: 0 0 4px $mediaListIconFocusSelectedShadow;
@@ -718,6 +730,7 @@ Media
         $mediaListIconTextSelectedShadow -1px 1px 0,
         $mediaListIconTextSelectedShadow 1px -1px 0,
         $mediaListIconTextSelectedShadow 1px 1px 0;
+    box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
     -moz-box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
     -o-box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
     -webkit-box-shadow: 0 0 4px $mediaListIconLabelSelectedShadow;
@@ -733,6 +746,7 @@ Media
         $mediaListIconTextFocusSelectedShadow -1px 1px 0,
         $mediaListIconTextFocusSelectedShadow 1px -1px 0,
         $mediaListIconTextFocusSelectedShadow 1px 1px 0;
+    box-shadow: 0 0 4px $mediaListIconLabelFocusSelectedShadow;
     -moz-box-shadow: 0 0 4px $mediaListIconLabelFocusSelectedShadow;
     -o-box-shadow: 0 0 4px $mediaListIconLabelFocusSelectedShadow;
     -webkit-box-shadow: 0 0 4px $mediaListIconLabelFocusSelectedShadow;
@@ -757,6 +771,7 @@ Media
 .$themeClass .OxInfoList.OxMedia.OxFocus .OxItem.OxSelected .OxInfoElement .OxText > div {
     border-color: transparent;
     background-image: none;
+    box-shadow: 0 0 0 transparent;
     -moz-box-shadow: 0 0 0 transparent;
     -o-box-shadow: 0 0 0 transparent;
     -webkit-box-shadow: 0 0 0 transparent;
@@ -783,6 +798,7 @@ Menus
 }
 
 .$themeClass .OxMenu {
+    box-shadow: 0 2px 4px $menuShadow;
     -moz-box-shadow: 0 2px 4px $menuShadow;
     -o-box-shadow: 0 2px 4px $menuShadow;
     -webkit-box-shadow: 0 2px 4px $menuShadow;
@@ -1132,6 +1148,7 @@ Miscellaneous
     background-image: -o-linear-gradient(top, $tooltipGradient);
     background-image: -webkit-linear-gradient(top, $tooltipGradient);
     color: $tooltipColor;
+    box-shadow: 2px 2px 4px $tooltipShadow;
     -moz-box-shadow: 2px 2px 4px $tooltipShadow;
     -o-box-shadow: 2px 2px 4px $tooltipShadow;
     -webkit-box-shadow: 2px 2px 4px $tooltipShadow;