Working on default theme, and base controllers