Continued Templating

Continued templating, Switched custom post type from functions.php to a
plugin so it is no longer theme dependent