Enhance default theme