Set Theme as optional