cleaned up themes structure