Move breakpoints to own config, better layout var naming, cleanup type varients