Initial work on theming section