Getting more work done on new default theme.