Did some work on custom button theme