Theme updates to include more key modes