Revert "Use our own Theme Manager files"

This reverts commit bc8ddb475b278ba61677328f593ed897a1fb63d6.

Change-Id: I1cd84af68fc5e5fd7a788da00d4ccf36e10cb74a