Update disabled field colours
Update buttons to use new colours and new variable names
Remove deprecated button variables