theme update, additional features, helper funcs, refactoring