Updated theme to use Color struct