Added some well known themes to the contrib fileset pattern, fixed variable names and added some conditions to the local deployment target