Fix for Theming Issues.