minor theme work and error display logic