Merge "Update dark theme colors and dividers" into sc-dev