Straighten out gray defaults on components
Move newest stuff to other file