further work on theme and tweaks to framework