Start work for adding template and theme support