improve template : split theme from template itself
first rename "theme" as "icon" and move al icons under it