Temporary fix for class manipulation

Custom Classes not working (e.g. button classes)