More work on default theme.