Moving to an _includes type of system, style updates