Merge "Fixes inability to toggle dark mode when in a mode. " into main