Merge "Update formatting for CSS files in skins/"