Changin structure to only share theme