Re-added dark theme and did it properly.