Conflicts: - `spec/helpers/theme_helper_spec.rb`: Conflict due to glitch-soc's different theming system. Adapted upstream changes to glitch-soc's theming system.
Conflicts: - `spec/helpers/theme_helper_spec.rb`: Conflict due to glitch-soc's different theming system. Adapted upstream changes to glitch-soc's theming system.