refactored theme to 1.5 core