border update, color tweaks
index update