Merge "DifferenceEngine: Use CSS classes instead of inline styles"