Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream modified `theme_color_tags` to work on color scheme rather than theme.
Updated it as well.
- `app/views/layouts/embedded.html.haml`:
Upstream changed the embed theme from `mastodon-light` to `system`.
Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
Accomodate `theme_color_tags` changes.
b6b6e142ba