new data structure changes

new templates & re-defined themes