Fix some styles cause rebasing sucks
God only knows how this crap works