Fixed g2 same category bug
Fonts push ni Vanny (sorry conflict shiz huhuhu)