Fixed colour issues
Fixed flatview keyboard issues
Fixed macro warning