- Merged Finally, still some components not working