Fixing Race Condition. And also dark mode is a thing now.