Rename colour dicts
Do manual spike_pos subplot layout