MOAR fixes for themes