Add modularity to theme