Themes: Small fixes