more work on default theme