Fix with dark theme