Added theme. Added error message. Clean-up