Fixes for themes