updated logic for ack state and setting subject
updated templates for ack colours and font size
merge conflict resolved