Make theme more consistent with design