Work on theming in progress