Build fixup + add some more styles from core