Simplified code by removing unused parts: we now only modify the "fill"
value by highlighting/restoring previous value