Make props match options for general-functions.php