Fixes for Themes