further work on theming page