Make it more like default theme