Conflicts: - `package.json`: Upstream added/updated dependency adjacent to glitch-soc-only dependency. Updated as upstream did. - `vite.config.mts`: Upstream reworked the config file while using a different plugin for themes. Adapted upstream's changes. - `yarn.lock`: Same as `package.json`