Cleaned up the overrides to use the named variables
Fixed failing tests for correct css in header