Reworked the build-in themes