Add icons, add theme, more fields :shipit: