More work on default theme. Add prefix support in title