Clean code for default theme