Working on themes
More work on theme rendering