Merge "Make dialog change with dark theme"