Updated custom types and taxonomies, added options settings