Improved default theme