Updated color themes and layouts