Forgot to add some classes in the merge.