Added better formatting for categories, custom theme options for pages.