Merge "Refactor theme colors, fix dialog background, accent in light Settings"