Color Changes

Also changed some nav stuff too