Revert "Squash Dark UI commits from Slim"
Early cherry-pick, will get again once merged.

This reverts commit 3d88ce9f5e1cea1e8ce9fc0e2df5da91f701b011.