Fixes for the dark theme
Progress
Redo changes