Work in progress - templates, plugin/theme app