Type choices for FeinCMS 1.7

Woo! Living in the future! `:P`