Revert "Move Dark UI into themes"

This reverts commit 1f9fb5c22a32ef5da2074d875347573d650510e9.

Change-Id: I7526aad9b9c265d2b5242a080e926d4dab48ae45