Fix more theming errors