some work on the default theme