Workaround bundle construction bug. Move custom into theme