Merge "Changed Settings application theme"