first merge of wasimo theme with A1