gbg fix + style system refactoring