Reorder site.variables for easier scannability, adjust highlighted text color