Fixed bug with default theme