updated core code with code from theme framework