separated out theme check and added theme clean