overhauled for new theme based structure