Add more core/theme todos