Added comments to theme support