Add screen classes (draft)